git.polytechnique.org Git - platal.git/commit

projects / platal.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: bb37505) | patch

author	Stéphane Jacob <sj@m4x.org>
	Mon, 14 Nov 2011 09:07:25 +0000 (10:07 +0100)
committer	Stéphane Jacob <sj@m4x.org>
	Mon, 14 Nov 2011 09:07:25 +0000 (10:07 +0100)
commit	c8ab27eb822db39d5e3f26e202fa4ac01f76489f
tree	0218126ee2309a47c87117d3a73a126fcd99fb67	tree \| snapshot
parent	bb3750551b8b4009928a1c6cd9fec918361b8ad3	commit \| diff

More merge updates.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

modules/fusionax.php		diff \| blob \| blame \| history
modules/fusionax/formation.pl		diff \| blob \| blame \| history
templates/fusionax/names.tpl		diff \| blob \| blame \| history
upgrade/1.0.1/merge.php		diff \| blob \| blame \| history

plat/al