git://git.onelab.eu / sfa-gui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c7aa14 6f56bb4)
Merge branch 'master' of ssh://git.onelab.eu/git/sfa-gui marcoy-dev master
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 8 Sep 2010 09:06:43 +0000 (11:06 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 8 Sep 2010 09:06:43 +0000 (11:06 +0200)

Trivial merge
sfa-gui