projects / gpl / argeo-tp.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5998382 4e5ce28)
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

1  2 
META-INF/spring/distribution.xml patch | diff1 | diff2 | blob | history

diff --cc META-INF/spring/distribution.xml
index 23bc0717ed8ab72af673a1de9518d0609b255c26,496d881e91fea2e91eeda5d99b76f7970849e74e..1c2b8cb753ca69fd89d011cdd1743a767afe3fd3
--- 1/META-INF/spring/distribution.xml
--- 2/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@@ -99,4 -111,4 +114,4 @@@
                <property name="osgiFactory" ref="osgiFactory" />
        </bean>
  
--</beans>
++</beans>
Argeo Third Parties - An OSGi enterprise distribution