projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b6e4ff 0768c6d)
Merge remote branch 'origin/xorg/maint' into xorg/master
authorStéphane Jacob <sj@m4x.org>
Tue, 19 Apr 2011 14:56:48 +0000 (16:56 +0200)
committerStéphane Jacob <sj@m4x.org>
Tue, 19 Apr 2011 14:56:48 +0000 (16:56 +0200)
1  2 
modules/admin.php patch | diff1 | diff2 | blob | history

diff --cc modules/admin.php
Simple merge
plat/al