projects
/
platal.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fc34b3d
b244482
)
Merge branch 'xorg/1.0.2/master' into xorg/master
author
Stéphane Jacob
<sj@m4x.org>
Fri, 7 Jan 2011 14:02:04 +0000
(15:02 +0100)
committer
Stéphane Jacob
<sj@m4x.org>
Fri, 7 Jan 2011 14:02:04 +0000
(15:02 +0100)
1
2
modules/googleapps.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
modules/googleapps.php
Simple merge