projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
9676757
)
Merge branch 'backport' into work
author
Mikael Magnusson
<mikachu@comhem.se>
Sun, 2 Mar 2008 18:41:32 +0000
(19:41 +0100)
committer
Mikael Magnusson
<mikachu@comhem.se>
Sun, 2 Mar 2008 18:41:32 +0000
(19:41 +0100)
Conflicts:
openbox/actions/desktop.c
openbox/actions/if.c
No differences found