projects / gpl / argeo-tp.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: 2282fcf)
Merge branch 'master' of
authorBruno Sinou <bsinou@argeo.org>
Thu, 5 Jun 2014 08:49:47 +0000 (10:49 +0200)
committerBruno Sinou <bsinou@argeo.org>
Thu, 5 Jun 2014 08:49:47 +0000 (10:49 +0200)
ssh://bsinou@git.argeo.org:322/var/lib/git/git.argeo.org/org.argeo.tp.slc.factory.git/

Conflicts:
META-INF/MANIFEST.MF
pom.xml


No differences found
Argeo Third Parties - An OSGi enterprise distribution