projects / platal.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48ad52e e8627f9)
Merge commit 'origin/master' into fusionax
authorFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:28:20 +0000 (14:28 +0100)
committerFlorent Bruneau <florent.bruneau@polytechnique.org>
Sun, 1 Feb 2009 13:28:20 +0000 (14:28 +0100)
Conflicts:

core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
1  2 
templates/search/adv.form.tpl patch | diff1 | diff2 | blob | history

diff --cc templates/search/adv.form.tpl
Simple merge
plat/al