projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b137c4e
0e3ad63
)
Merge branch 'backport' into 3.4
author
Mikael Magnusson
<mikachu@comhem.se>
Sun, 2 Mar 2008 16:25:13 +0000
(17:25 +0100)
committer
Mikael Magnusson
<mikachu@comhem.se>
Sun, 2 Mar 2008 16:25:13 +0000
(17:25 +0100)
Conflicts (these changes don't apply at all to 3.4, so ignored them):
openbox/actions/desktop.c
openbox/actions/if.c
Trivial merge
projects / mikachu / openbox.git / commitdiff