projects / dana / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3618d92 f8eae5e)
Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 01:58:38 +0000 (21:58 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 01:58:38 +0000 (21:58 -0400)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
Openbox Window Manager