Changelog for 1.1.4

ChangeLog

@@ -1,6 +1,12 @@
 ChangeLog
 =========
-version 1.1.2 (release 2012-11- ), csync 0.60.2 required
+version 1.1.4 (release 2012-12-18), csync 0.60.4 required
+  * No changes to mirall, csync fixes only.
+
+version 1.1.3 (release 2012-11-30), csync 0.60.3 required
+  * No changes to mirall, csync fixes only.
+
+version 1.1.2 (release 2012-11-26), csync 0.60.2 required
   * [Fixes] Allow to properly cancel the password dialog.
   * [Fixes] Share folder name correctly percent encoded with old Qt
             4.6 builds ie. Debian.

VERSION.cmake

@@ -1,5 +1,5 @@
 set( VERSION_MAJOR 1 )
 set( VERSION_MINOR 1 )
-set( VERSION_PATCH 2 )
-set( VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}rc )
+set( VERSION_PATCH 4 )
+set( VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH} )
 

src/mirall/sslerrordialog.cpp

@@ -131,8 +131,8 @@ static QByteArray formatHash(const QByteArray &fmhash)
     QByteArray hash;
     int steps = fmhash.length()/2;
     for (int i = 0; i < steps; i++) {
-        hash.append(fmhash[i]);
-        hash.append(fmhash[i+1]);
+        hash.append(fmhash[i*2]);
+        hash.append(fmhash[i*2+1]);
         hash.append(' ');
     }
     return hash;