]> git.draconx.ca Git - fvwmconf.git/commitdiff
Merge branch 'master' of git://git.draconx.ca/fvwmconf
authorNick Bowler <draconx@gmail.com>
Sun, 31 Aug 2008 18:27:27 +0000 (14:27 -0400)
committerNick Bowler <draconx@gmail.com>
Sun, 31 Aug 2008 18:27:27 +0000 (14:27 -0400)
1  2 
config

diff --cc config
Simple merge