Release candidate for autoupdate 2.1.1

SDK update
polmr · Jul 23, 2015 · b4c347b · b4c347b
1 parent 70ced43
commit b4c347b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/Source/MEGASync/control/Preferences.cpp b/Source/MEGASync/control/Preferences.cpp
@@ -11,12 +11,12 @@ extern Q_CORE_EXPORT int qt_ntfs_permission_lookup;
 #endif
 
 const char Preferences::CLIENT_KEY[] = "FhMgXbqb";
-const char Preferences::USER_AGENT[] = "MEGAsync/2.1.0.5";
-const int Preferences::VERSION_CODE = 2100;
-const int Preferences::BUILD_ID = 5;
+const char Preferences::USER_AGENT[] = "MEGAsync/2.1.1";
+const int Preferences::VERSION_CODE = 2101;
+const int Preferences::BUILD_ID = 0;
 // Do not change the location of VERSION_STRING, create_tarball.sh parses this file
 const QString Preferences::VERSION_STRING = QString::fromAscii("2.1.1");
-const QString Preferences::SDK_ID = QString::fromAscii("4012b");
+const QString Preferences::SDK_ID = QString::fromAscii("2e7f3");
 const QString Preferences::TRANSLATION_FOLDER = QString::fromAscii("://translations/");
 const QString Preferences::TRANSLATION_PREFIX = QString::fromAscii("MEGASyncStrings_");
 

diff --git a/Source/MEGASync/icon.rc b/Source/MEGASync/icon.rc
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO     VERSIONINFO
-FILEVERSION         2, 1, 0, 5
-PRODUCTVERSION      2, 1, 0, 5
+FILEVERSION         2, 1, 1, 0
+PRODUCTVERSION      2, 1, 1, 0
 FILEFLAGSMASK       0x3fL
 FILEFLAGS           0
 FILEOS              VOS_NT_WINDOWS32
@@ -23,7 +23,7 @@ BEGIN
             VALUE   "LegalCopyright",   "Mega Limited 2015\0"
             VALUE   "OriginalFilename", "MEGAsync.exe\0"
             VALUE   "ProductName",      "MEGAsync\0"
-            VALUE   "ProductVersion",   "2.1.0.5\0"
+            VALUE   "ProductVersion",   "2.1.1.0\0"
         END
     END
 END

diff --git a/Source/MEGASync/mega b/Source/MEGASync/mega
diff --git a/installer.nsi b/installer.nsi
@@ -24,9 +24,9 @@ VIAddVersionKey "LegalCopyright" "MEGA Limited 2015"
 VIAddVersionKey "ProductName" "MEGAsync"
 
 ; Version info
-VIProductVersion "2.1.0.5"
-VIAddVersionKey "FileVersion" "2.1.0.5"
-VIAddVersionKey "ProductVersion" "2.1.0.5"
+VIProductVersion "2.1.1.0"
+VIAddVersionKey "FileVersion" "2.1.1.0"
+VIAddVersionKey "ProductVersion" "2.1.1.0"
 !define PRODUCT_VERSION "2.1.1"
 
 !define PRODUCT_PUBLISHER "Mega Limited"
+4 −4		bindings/ios/3rdparty/build-all.sh
+1 −1		bindings/ios/3rdparty/build-curl.sh
+1 −1		bindings/ios/3rdparty/build-openssl.sh
+4 −0		bindings/ios/MEGASDK.xcodeproj/project.pbxproj
+76 −65		bindings/wp8/MRequest.cpp
+60 −60		bindings/wp8/MRequest.h
+98 −39		bindings/wp8/MegaSDK.cpp
+257 −244		bindings/wp8/MegaSDK.h
+1 −1		examples/Swift/README.md
+1 −1		examples/iOS/README.md
+16 −0		include/mega/command.h
+2 −0		include/mega/megaapp.h
+6 −0		include/mega/megaclient.h
+3 −14		include/megaapi.h
+4 −1		include/megaapi_impl.h
+54 −0		src/commands.cpp
+1 −1		src/megaapi.cpp
+67 −30		src/megaapi_impl.cpp
+20 −0		src/megaclient.cpp