# HG changeset patch # User Jaroslav Tulach # Date 1367328177 -7200 # Node ID 75daa5478b897f554f387dec9c55d0ed3ef272ef # Parent 692fc4c1990dd93c41b8b3c2bc70f7657b3ee2e5# Parent 4e09d2b924ffb3f7da975c2674486a9f54b84600 Merge in the release-0.7 head together with preparation for next development diff -r 692fc4c1990d -r 75daa5478b89 .hgtags --- a/.hgtags Tue Apr 30 15:16:08 2013 +0200 +++ b/.hgtags Tue Apr 30 15:22:57 2013 +0200 @@ -7,3 +7,4 @@ 0000000000000000000000000000000000000000 release-${releaseVersion} 52a4a5f868bccc67d50ad17f793b9ebabdf75d88 release-0.6 e3845e4f0ec83ef27df045528e73fe4f1e851190 release-0.7 +9e3a4ba88c2f2f1c63ffcbeb1bb91428e6c212ea release-0.7 diff -r 692fc4c1990d -r 75daa5478b89 javaquery/demo-twitter/src/main/resources/org/apidesign/bck2brwsr/demo/twitter/index.html --- a/javaquery/demo-twitter/src/main/resources/org/apidesign/bck2brwsr/demo/twitter/index.html Tue Apr 30 15:16:08 2013 +0200 +++ b/javaquery/demo-twitter/src/main/resources/org/apidesign/bck2brwsr/demo/twitter/index.html Tue Apr 30 15:22:57 2013 +0200 @@ -90,7 +90,7 @@ diff -r 692fc4c1990d -r 75daa5478b89 rt/archetype/src/main/resources/archetype-resources/pom.xml --- a/rt/archetype/src/main/resources/archetype-resources/pom.xml Tue Apr 30 15:16:08 2013 +0200 +++ b/rt/archetype/src/main/resources/archetype-resources/pom.xml Tue Apr 30 15:22:57 2013 +0200 @@ -44,7 +44,7 @@ org.apidesign.bck2brwsr bck2brwsr-maven-plugin - 0.7-SNAPSHOT + 0.8-SNAPSHOT @@ -103,13 +103,13 @@ org.apidesign.bck2brwsr emul - 0.7-SNAPSHOT + 0.8-SNAPSHOT rt org.apidesign.bck2brwsr javaquery.api - 0.7-SNAPSHOT + 0.8-SNAPSHOT org.testng @@ -122,13 +122,13 @@ vm4brwsr js zip - 0.7-SNAPSHOT + 0.8-SNAPSHOT provided org.apidesign.bck2brwsr vmtest - 0.7-SNAPSHOT + 0.8-SNAPSHOT test