]> git.draconx.ca Git - fvwmconf.git/commit
Merge git://git.draconx.com/fvwmconf
authorNick Bowler <nbowler@ellipticsemi.com>
Wed, 21 May 2008 15:56:17 +0000 (11:56 -0400)
committerNick Bowler <nbowler@ellipticsemi.com>
Wed, 21 May 2008 15:56:17 +0000 (11:56 -0400)
commit0e41b01616fa8eecd6054393877a8c048c93889d
tree7e5ef0e40bfed166c11eb98de63bce4399bb9064
parentb0c2e7aee6eb11bee61a971e2bf530e325378c43
parentbafac9b15764ae82090b5f34cc3e2c36361b36a4
Merge git://git.draconx.com/fvwmconf

Conflicts:

scripts/C/Makefile
config