Merge lp:~popey/sudoku-app/fix-1288885 into lp:sudoku-app

Status: Merged
Approved by: Dinko Osmankovic on 2014-03-10
Approved revision: 166
Merged at revision: 166
Proposed branch: lp:~popey/sudoku-app/fix-1288885
Merge into: lp:sudoku-app
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
sudoku-app.desktop (+1/-1)
To merge this branch: bzr merge lp:~popey/sudoku-app/fix-1288885
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-03-10
Sudoku Touch developers 2014-03-10 Pending
Review via email: mp+210177@code.launchpad.net

Commit message

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-14 08:26:17 +0000
3+++ debian/changelog 2014-03-10 10:25:52 +0000
4@@ -1,3 +1,9 @@
5+sudoku-app (1.0ubuntu1) UNRELEASED; urgency=medium
6+
7+ * Add -qt5 command line option (LP: #1288885)
8+
9+ -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:22:12 +0000
10+
11 sudoku-app (1.0) precise; urgency=low
12
13 * Pushed to version 1.0; Added Sam as author for the logo designs.
14
15=== modified file 'sudoku-app.desktop'
16--- sudoku-app.desktop 2014-02-26 12:10:33 +0000
17+++ sudoku-app.desktop 2014-03-10 10:25:52 +0000
18@@ -2,7 +2,7 @@
19 Name=Sudoku
20 Version=1.0
21 Comment=Sudoku Game for Ubuntu Touch
22-Exec=qmlscene /usr/share/sudoku-app/sudoku-app.qml
23+Exec=qmlscene -qt5 /usr/share/sudoku-app/sudoku-app.qml
24 Icon=/usr/share/sudoku-app/SudokuGameIcon.png
25 Terminal=false
26 Type=Application

Subscribers

People subscribed via source and target branches