commit c9aab32d1502f258981e7e723a06223d104ee708
author Michael Semb Wever <mck@apache.org> Sun Nov 03 10:54:34 2013 +0000
committer Michael Semb Wever <mck@apache.org> Sun Nov 03 10:54:34 2013 +0000
tree 2f80ce90d33348717f87df7770d4d39b14eaf327
parent ad38048f2d9887e156dfea19c8437fef6759a9da

svn merge -c1538333 ^/tiles/framework/branches/TILES_3_0_X .

> Use the new tiles-master-6
> http://thread.gmane.org/gmane.comp.apache.tiles.devel/595



git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@1538335 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 8d04f2d..a3e51f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <artifactId>tiles-master</artifactId>
         <groupId>org.apache.tiles</groupId>
-        <version>4</version>
+        <version>6</version>
         <relativePath />
     </parent>