projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3ccbd1
92bba40
)
Merge branch 'backport' into 3.4
author
Mikael Magnusson
<mikachu@comhem.se>
Tue, 15 Apr 2008 16:18:09 +0000
(18:18 +0200)
committer
Mikael Magnusson
<mikachu@comhem.se>
Tue, 15 Apr 2008 16:18:09 +0000
(18:18 +0200)
1
2
openbox/config.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
openbox/config.c
Simple merge