projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82af3fc b3d92c8)
Merge branch 'xorg/master' into xorg/f/surveys
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 9 Mar 2011 21:16:59 +0000 (22:16 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 9 Mar 2011 21:18:22 +0000 (22:18 +0100)
1  2 
core patch | diff1 | diff2 | blob | history
htdocs/css/base.css patch | diff1 | diff2 | blob | history

diff --cc core
index 96dd0b0,38d6691..a6522bb
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 96dd0b0fbaaedf7d274cc919268fd717275d605f
 -Subproject commit 38d66919e0b8d40eb28d2ffcf81ae11f8452cfe1
++Subproject commit a6522bb9e59e898a417a7da1acdd31ba45838c86
diff --cc htdocs/css/base.css
Simple merge
plat/al