You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/05/01 11:19:29 UTC

svn commit: r770595 - in /jackrabbit/trunk: jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/ jackrabbit-api/src/main/resources/META-INF/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/ jackrabbit-core/src/main/resource...

Author: jukka
Date: Fri May  1 09:19:28 2009
New Revision: 770595

URL: http://svn.apache.org/viewvc?rev=770595&view=rev
Log:
drop unnecessary svn:mergeinfos

Modified:
    jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java   (props changed)
    jackrabbit/trunk/jackrabbit-api/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-api/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/StringIndex.java   (props changed)
    jackrabbit/trunk/jackrabbit-core/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-core/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestRepository.java   (props changed)
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-commons/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-commons/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/org/apache/jackrabbit/server/io/mimetypes.properties   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/resources/META-INF/   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr-tests/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-jcr2spi/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-spi-commons/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-spi/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-spi/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-spi2jcr/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-spi2jcr/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-text-extractors/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-text-extractors/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-webdav/src/main/resources/META-INF/LICENSE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-webdav/src/main/resources/META-INF/NOTICE.txt   (props changed)
    jackrabbit/trunk/jackrabbit-webdav/src/main/resources/org/apache/jackrabbit/webdav/statuscode.properties   (props changed)

Propchange: jackrabbit/trunk/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/observation/JackrabbitEvent.java
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-api/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-api/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/StringIndex.java
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-core/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-core/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/TestRepository.java
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jca/src/main/rar/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-commons/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/org/apache/jackrabbit/server/io/mimetypes.properties
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/resources/META-INF/
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-spi-commons/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-spi/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-spi/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-spi2jcr/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-text-extractors/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-text-extractors/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-webdav/src/main/resources/META-INF/LICENSE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-webdav/src/main/resources/META-INF/NOTICE.txt
            ('svn:mergeinfo' removed)

Propchange: jackrabbit/trunk/jackrabbit-webdav/src/main/resources/org/apache/jackrabbit/webdav/statuscode.properties
            ('svn:mergeinfo' removed)