]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 57fd14f 58aeac3)
Merge branch 'v2.6'
authorRichard Millet <remillet@berkeley.edu>
Sat, 25 Aug 2012 00:08:16 +0000 (17:08 -0700)
committerRichard Millet <remillet@berkeley.edu>
Sat, 25 Aug 2012 00:08:16 +0000 (17:08 -0700)
Conflicts:
3rdparty/nuxeo/build.xml
3rdparty/nuxeo/pom.xml

1  2 
3rdparty/nuxeo/pom.xml patch | diff1 | diff2 | blob | history

diff --cc 3rdparty/nuxeo/pom.xml
index 1703bb325edfb7c64c578242f77560f41aa472b3,773efa9a5dec955661be292f2f20b0de7ae25d1c..65e7d1618d41baf6ab0eb7dfc681842ad34461dc
--- 1/3rdparty/nuxeo/pom.xml
--- 2/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@@ -14,9 -14,12 +14,12 @@@
      <name>services.3rdparty.nuxeo</name>
  
      <modules>
 -        <module>nuxeo-platform-collectionspace</module>
 +              <module>nuxeo-platform-collectionspace</module>
                <module>nuxeo-platform-quote-api</module>
                <module>nuxeo-platform-quote</module>
+               <!-- REM : 8/23/2012 - Disabled due to integration and dependency issues between ImageMagick and Ghostscript on Linux machines
+               <module>nuxeo-platform-thumbnail</module>
+               -->
        </modules>
  
      <dependencies>