]> git.draconx.ca Git - fvwmconf.git/commitdiff
projects / fvwmconf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0c2e7a bafac9b)
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)
Conflicts:

scripts/C/Makefile

1  2 
config patch | diff1 | diff2 | blob | history

diff --cc config
Simple merge
Unnamed repository; edit this file 'description' to name the repository.