projects / dana / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80658c9 9695150)
Merge branch 'master' into 3.4
authorDana Jansens <danakj@orodu.net>
Sun, 15 Jul 2007 16:56:13 +0000 (12:56 -0400)
committerDana Jansens <danakj@orodu.net>
Sun, 15 Jul 2007 16:56:13 +0000 (12:56 -0400)
Conflicts:

openbox/actions/desktop.c

1  2 
openbox/frame.c patch | diff1 | diff2 | blob | history

diff --cc openbox/frame.c
Simple merge
Openbox Window Manager