projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b01dd0b
cec5480
)
Merge branch 'backport' into work
author
Dana Jansens
<danakj@orodu.net>
Thu, 14 Feb 2008 20:14:55 +0000
(15:14 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Thu, 14 Feb 2008 20:14:55 +0000
(15:14 -0500)
1
2
openbox/config.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
openbox/config.c
Simple merge