projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9fbd33c
c255738
)
Merge branch 'master' into 3.4-working
author
Dana Jansens
<danakj@orodu.net>
Sun, 22 Jul 2007 14:20:39 +0000
(10:20 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Sun, 22 Jul 2007 14:20:39 +0000
(10:20 -0400)
1
2
data/rc.xsd
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
data/rc.xsd
Simple merge