# HG changeset patch # User Jaroslav Tulach # Date 1420824810 -3600 # Node ID 46827acaac4ae3a89f49262c2b74880472ccb664 # Parent fd26342cf23dcc35175a736665b14b62389b6209# Parent 902eb5435f83f670ad0a9c30378f0d76a6bec263 Merging changes diff -r fd26342cf23d -r 46827acaac4a minesweeper/pom.xml --- a/minesweeper/pom.xml Fri Jan 09 06:10:00 2015 +0100 +++ b/minesweeper/pom.xml Fri Jan 09 18:33:30 2015 +0100 @@ -293,7 +293,7 @@ org.apidesign.brwsr dlvkbrwsr - 1.0 + 1.0.1 jar @@ -483,7 +483,7 @@ org.apidesign.brwsr ibrwsr - 1.0 + 1.0.1 runtime diff -r fd26342cf23d -r 46827acaac4a minesweeper/src/main/webapp/pages/index.html --- a/minesweeper/src/main/webapp/pages/index.html Fri Jan 09 06:10:00 2015 +0100 +++ b/minesweeper/src/main/webapp/pages/index.html Fri Jan 09 18:33:30 2015 +0100 @@ -28,6 +28,7 @@ Fair Minesweeper + diff -r fd26342cf23d -r 46827acaac4a minesweeper/src/main/webapp/pages/index_cs.html --- a/minesweeper/src/main/webapp/pages/index_cs.html Fri Jan 09 06:10:00 2015 +0100 +++ b/minesweeper/src/main/webapp/pages/index_cs.html Fri Jan 09 18:33:30 2015 +0100 @@ -28,6 +28,7 @@ Férové miny +