projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b8b5da
4b41ac8
)
Merge branch 'backport'
author
Dana Jansens
<danakj@orodu.net>
Sun, 20 Jan 2008 04:59:40 +0000
(23:59 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Sun, 20 Jan 2008 04:59:40 +0000
(23:59 -0500)
1
2
data/rc.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
data/rc.xml
Simple merge