1.1.0

juzzlin · Dec 29, 2013 · 8652fa5 · 8652fa5
1 parent f86dfc4
commit 8652fa5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,11 @@
+1.1.0
+=====
+
+* Remove needless ImageItem.
+* Fix render timer.
+* Fix problems with Qt4.
+* Don't use QPixmap in the worker thread.
+
 1.0.1
 =====
 

diff --git a/packaging/debian/changelog b/packaging/debian/changelog
@@ -1,3 +1,12 @@
+snm (1.1.0-1) precise; urgency=low
+
+  * Remove needless ImageItem.
+  * Fix render timer.
+  * Fix problems with Qt4.
+  * Don't use QPixmap in the worker thread.
+
+ -- Jussi Lind <[email protected]>  Sun, 29 Dec 2013 22:14:04 +0200
+
 snm (1.0.1-1) precise; urgency=low
 
   * Fix installation of desktop file.

diff --git a/scripts/genericLinuxBuild b/scripts/genericLinuxBuild
@@ -4,7 +4,7 @@
 
 QT5_QMAKE=~/qt5/bin/qmake
 TAR=tar
-VERSION=1.0.1
+VERSION=1.1.0
 
 # Build
 

diff --git a/scripts/mxeWindowsBuild b/scripts/mxeWindowsBuild
@@ -5,7 +5,7 @@
 MXE_QT5_QMAKE=~/mxe/usr/i686-pc-mingw32/qt5/bin/qmake
 ZIP=zip
 UNIX2DOS=unix2dos
-VERSION=1.0.1
+VERSION=1.1.0
 
 # Build
 

diff --git a/scripts/updatePPA.sh b/scripts/updatePPA.sh
@@ -1,5 +1,5 @@
-VERSION=1.0.1
-DEBIAN_VERSION=1.0.1-1
+VERSION=1.1.0
+DEBIAN_VERSION=1.1.0-1
 rm -rf *${VERSION}*
 cp ../simplenormalmapper-code/snm-$VERSION.tar.gz .
 mv snm-$VERSION.tar.gz snm_$VERSION.orig.tar.gz 

diff --git a/snm.pro b/snm.pro
@@ -12,7 +12,7 @@ DEFINES += USE_QT5
 QT += gui
 }
 
-DEFINES += VERSION=\\\"1.0.1\\\"
+DEFINES += VERSION=\\\"1.1.0\\\"
 
 # Input
 HEADERS += \
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     QT5_QMAKE=~/qt5/bin/qmake
     TAR=tar
-    VERSION=1.0.1
+    VERSION=1.1.0
     # Build
@@ Expand Down @@