Merging local changes
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Thu, 13 Nov 2014 14:17:11 +0100
changeset 230902eb5435f83
parent 226 40acb3267711
parent 229 6e5c2ce01688
child 231 46827acaac4a
Merging local changes
     1.1 --- a/minesweeper/pom.xml	Tue Nov 11 06:58:21 2014 +0100
     1.2 +++ b/minesweeper/pom.xml	Thu Nov 13 14:17:11 2014 +0100
     1.3 @@ -285,7 +285,7 @@
     1.4                <dependency>
     1.5                    <groupId>org.apidesign.brwsr</groupId>
     1.6                    <artifactId>dlvkbrwsr</artifactId>
     1.7 -                  <version>1.0</version>
     1.8 +                  <version>1.0.1</version>
     1.9                    <type>jar</type>
    1.10                </dependency>
    1.11                <dependency>
    1.12 @@ -475,7 +475,7 @@
    1.13                <dependency>
    1.14                    <groupId>org.apidesign.brwsr</groupId>
    1.15                    <artifactId>ibrwsr</artifactId>
    1.16 -                  <version>1.0</version>
    1.17 +                  <version>1.0.1</version>
    1.18                    <scope>runtime</scope>
    1.19                </dependency>
    1.20            </dependencies>
     2.1 --- a/minesweeper/src/main/webapp/pages/index.html	Tue Nov 11 06:58:21 2014 +0100
     2.2 +++ b/minesweeper/src/main/webapp/pages/index.html	Thu Nov 13 14:17:11 2014 +0100
     2.3 @@ -28,6 +28,7 @@
     2.4      <head>
     2.5          <title>Fair Minesweeper</title>
     2.6          <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     2.7 +        <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/>
     2.8          <link href="bootstrap.css" rel="stylesheet">
     2.9          <link href="bootstrap-responsive.css" rel="stylesheet">
    2.10          <link href="mines.css" rel="stylesheet">
     3.1 --- a/minesweeper/src/main/webapp/pages/index_cs.html	Tue Nov 11 06:58:21 2014 +0100
     3.2 +++ b/minesweeper/src/main/webapp/pages/index_cs.html	Thu Nov 13 14:17:11 2014 +0100
     3.3 @@ -28,6 +28,7 @@
     3.4      <head>
     3.5          <title>Férové miny</title>
     3.6          <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     3.7 +        <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"/>
     3.8          <link href="bootstrap.css" rel="stylesheet">
     3.9          <link href="bootstrap-responsive.css" rel="stylesheet">
    3.10          <link href="mines.css" rel="stylesheet">