projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a67b90 88aa48e)
Merge remote branch 'origin/xorg/master' into xorg/f/surveys
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 9 Mar 2011 21:25:39 +0000 (22:25 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Wed, 9 Mar 2011 21:25:39 +0000 (22:25 +0100)
Conflicts:
core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

Trivial merge
plat/al