Merge branch 'prepare-release-1.2.0'

jeremypw · Mar 28, 2018 · b2d99df · b2d99df
2 parents 7c07a0e + 50b9f9b
commit b2d99df
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
@@ -23,6 +23,18 @@
         <category>LogicGame</category>
     </categories>
     <releases>
+        <release version="1.2.0" date="2018-03-28" urgency="low">
+            <description>
+                <ul>
+                    <li>Hint button</li>
+                    <li>Strikethrough completed blocks in clue label (with option to disable)</li>
+                    <li>Clue label turns red if completed incorrectly (with option to disable)</li>
+                    <li>Additional shortcuts</li>
+                    <li>Some code refactoring and cleanup</li>
+                    <li>Various bug fixes</li>
+                </ul>
+            </description>
+        </release>
         <release version="1.1.0" date="2018-02-16" urgency="low">
             <description>
                 <ul>

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,14 @@
+com.github.jeremypw.gnonograms (1.2.0) xenial; urgency=low
+
+  * Hint button
+  * Strikethrough completed blocks in clue label (with option to disable)
+  * Clue label turns red if completed incorrectly (with option to disable)
+  * Additional shortcuts
+  * Some code refactoring and cleanup
+  * Various bug fixes
+
+ -- Jeremy Wootten <jeremywootten@gmail.com>  Wed, 28 Mar 2018 17:01:00 +0000
+
 com.github.jeremypw.gnonograms (1.1.0) xenial; urgency=low
 
   * Save and restore move history

diff --git a/src/core/Gnonogram_solver.vala b/src/core/Gnonogram_solver.vala
@@ -350,7 +350,7 @@ namespace Gnonograms {
                         guesser.cancel_previous_guess ();
                         state = SolverState.UNDEFINED;
                     } else {
-                        critical ("unexpected initial sState %s", initial_state.to_string ());
+                        critical ("unexpected initial state %s", initial_state.to_string ());
                         assert_not_reached ();
                     }