Xinqi Bao's Git

projects / dmenu.git / commitdiff
summary | log | commit | diff | tree
raw | combined (merge: c04b688 4ebd7c4)
Merge.
authorKris Maglione <[email protected]>
Wed, 23 May 2007 20:44:15 +0000 (16:44 -0400)
committerKris Maglione <[email protected]>
Wed, 23 May 2007 20:44:15 +0000 (16:44 -0400)

Trivial merge