projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
52dafaf
2ce109f
)
Merge branch 'master' into 3.4-working
author
Dana Jansens
<danakj@orodu.net>
Sat, 21 Jul 2007 19:57:20 +0000
(15:57 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Sat, 21 Jul 2007 19:57:20 +0000
(15:57 -0400)
1
2
openbox/actions/moveresizeto.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
openbox/actions/moveresizeto.c
Simple merge