Author: rombert
Date: Mon Jan 15 12:07:09 2018
New Revision: 1821148
URL: http://svn.apache.org/viewvc?rev=1821148&view=rev
Log:
OAK-7138 - Move metatype files in source control to correct location
Merge r1821141 into 1.8
Added:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/resources/OSGI-INF/l10n/
- copied from r1821141,
jackrabbit/oak/trunk/oak-segment-tar/src/main/resources/OSGI-INF/l10n/
Removed:
jackrabbit/oak/branches/1.8/oak-segment-tar/src/main/resources/OSGI-INF/metatype/
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 15 12:07:09 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820859,1820861,1820878,1820888,1820947,1821130,1821140
+/jackrabbit/oak/trunk:1820660-1820661,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141
/jackrabbit/trunk:1345480
