# HG changeset patch # User Jaroslav Tulach # Date 1415884631 -3600 # Node ID 902eb5435f83f670ad0a9c30378f0d76a6bec263 # Parent 40acb326771154615cd6dc42f48cdb36c3d42140# Parent 6e5c2ce0168805a4dba7149f2d1239ca877085cc Merging local changes diff -r 40acb3267711 -r 902eb5435f83 minesweeper/pom.xml --- a/minesweeper/pom.xml Tue Nov 11 06:58:21 2014 +0100 +++ b/minesweeper/pom.xml Thu Nov 13 14:17:11 2014 +0100 @@ -285,7 +285,7 @@ org.apidesign.brwsr dlvkbrwsr - 1.0 + 1.0.1 jar @@ -475,7 +475,7 @@ org.apidesign.brwsr ibrwsr - 1.0 + 1.0.1 runtime diff -r 40acb3267711 -r 902eb5435f83 minesweeper/src/main/webapp/pages/index.html --- a/minesweeper/src/main/webapp/pages/index.html Tue Nov 11 06:58:21 2014 +0100 +++ b/minesweeper/src/main/webapp/pages/index.html Thu Nov 13 14:17:11 2014 +0100 @@ -28,6 +28,7 @@ Fair Minesweeper + diff -r 40acb3267711 -r 902eb5435f83 minesweeper/src/main/webapp/pages/index_cs.html --- a/minesweeper/src/main/webapp/pages/index_cs.html Tue Nov 11 06:58:21 2014 +0100 +++ b/minesweeper/src/main/webapp/pages/index_cs.html Thu Nov 13 14:17:11 2014 +0100 @@ -28,6 +28,7 @@ Férové miny +