Xinqi Bao's Git

projects / dwm.git / diff
summary | log | commit | diff | tree
raw | combined (merge: f25cc56 ae1d865)
branch merge
authorAnselm R Garbe <[email protected]>
Tue, 17 Jun 2008 10:20:18 +0000 (11:20 +0100)
committerAnselm R Garbe <[email protected]>
Tue, 17 Jun 2008 10:20:18 +0000 (11:20 +0100)
config.def.h diff1 | diff2 | blob | history

diff --cc config.def.h
Simple merge