# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1410858437 -7200
# Node ID 22bc39a538cdb61e9f7ff5bdd5a6fe1e23f75829
# Parent  7d091558d9f425859af18ddb2a6ee306bde83d42# Parent  0e4f488d5fa6d945ed42cb7d86a8fdabaecafbc0
Manual merge on default branch

diff -r 7d091558d9f4 -r 22bc39a538cd minesweeper/pom.xml
--- a/minesweeper/pom.xml	Fri Aug 29 22:49:26 2014 +0200
+++ b/minesweeper/pom.xml	Tue Sep 16 11:07:17 2014 +0200
@@ -4,7 +4,7 @@
 
   <groupId>org.apidesign.demo</groupId>
   <artifactId>minesweeper</artifactId>
-  <version>2.0-SNAPSHOT</version>
+  <version>2.4-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
       <artifactId>demo</artifactId>
@@ -286,7 +286,7 @@
               <dependency>
                   <groupId>org.apidesign.brwsr</groupId>
                   <artifactId>dlvkbrwsr</artifactId>
-                  <version>1.0-SNAPSHOT</version>
+                  <version>1.0</version>
                   <type>jar</type>
               </dependency>
               <dependency>
@@ -476,7 +476,7 @@
               <dependency>
                   <groupId>org.apidesign.brwsr</groupId>
                   <artifactId>ibrwsr</artifactId>
-                  <version>0.8.3</version>
+                  <version>1.0</version>
                   <scope>runtime</scope>
               </dependency>
           </dependencies>
diff -r 7d091558d9f4 -r 22bc39a538cd pom.xml
--- a/pom.xml	Fri Aug 29 22:49:26 2014 +0200
+++ b/pom.xml	Tue Sep 16 11:07:17 2014 +0200
@@ -13,7 +13,7 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>1.0-SNAPSHOT</net.java.html.version>
+      <net.java.html.version>1.0</net.java.html.version>
       <nb.html.version>0.8.3</nb.html.version>
       <bck2brwsr.version>0.9</bck2brwsr.version>
       <teavm.version>0.1</teavm.version>