CVS: cvs.openbsd.org: xenocara

[Matthieu Herrb]

CVSROOT:        /cvs
Module name:    xenocara
Changes by:     matth...@cvs.openbsd.org        2015/01/01 10:37:52

Modified files:
        app/mkfontscale: compile 
        app/twm        : compile 
        lib/libX11     : compile 

Log message:
Fix bad merges.