linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  poy (poy)
------------------------------------------------------------
revno: 3085 [merge]
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Sun 2012-10-21 15:56:27 +0200
message:
  merge 0.802
modified:
  changelog.txt
  dcpp/version.h
  installer/SConscript
  win32/DCPlusPlus.rc


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'changelog.txt'
--- changelog.txt	2012-10-20 16:24:50 +0000
+++ changelog.txt	2012-10-21 13:56:27 +0000
@@ -1,3 +1,4 @@
+-- 0.802 2012-10-20 --
 * Perf improvements using lock-free queues, requires P6 CPUs (poy)
 * Reduce freezes when displaying file list dirs that contain lots of files (poy)
 * Less CPU consumption with large hubs/queues/lists (poy)

=== modified file 'dcpp/version.h'
--- dcpp/version.h	2012-10-03 21:01:13 +0000
+++ dcpp/version.h	2012-10-20 12:11:48 +0000
@@ -21,8 +21,8 @@
 #define APPNAME "DC++"
 
 // don't forget to update the .rc file as well!
-#define VERSIONSTRING "0.801"
-#define VERSIONFLOAT 0.801
+#define VERSIONSTRING "0.802"
+#define VERSIONFLOAT 0.802
 
 namespace dcpp {
 extern const std::string fullVersionString;

=== modified file 'installer/SConscript'
--- installer/SConscript	2011-12-29 13:31:38 +0000
+++ installer/SConscript	2012-10-21 13:56:27 +0000
@@ -101,7 +101,7 @@
 				name = 'NorwegianNynorsk'
 			elif name == 'Brazilian Portuguese':
 				name = 'PortugueseBR'
-			elif name == 'Simplified Chinese':
+			elif name == 'Chinese' or name == 'Simplified Chinese' or name == 'Chinese (Simplified)':
 				name = 'SimpChinese'
 			if os.path.exists(os.path.dirname(nsis) + '/Contrib/Language files/' + name + '.nlf'):
 				f_i18n.write('!insertmacro MUI_LANGUAGE "' + name + '"\n!insertmacro LANGFILE_INCLUDE "_' + name + '.nsh"\n')

=== modified file 'win32/DCPlusPlus.rc'
--- win32/DCPlusPlus.rc	2012-10-03 21:01:13 +0000
+++ win32/DCPlusPlus.rc	2012-10-20 12:11:48 +0000
@@ -99,8 +99,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,0,1
- PRODUCTVERSION 0,8,0,1
+ FILEVERSION 0,8,0,2
+ PRODUCTVERSION 0,8,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -117,12 +117,12 @@
         BEGIN
             VALUE "Comments", "http://dcplusplus.sourceforge.net";
             VALUE "FileDescription", "DC++"
-            VALUE "FileVersion", "0, 8, 0, 1"
+            VALUE "FileVersion", "0, 8, 0, 2"
             VALUE "InternalName", "DC++"
             VALUE "LegalCopyright", "Copyright 2001-2012 Jacek Sieka"
             VALUE "OriginalFilename", "DCPlusPlus.exe"
             VALUE "ProductName", "DC++"
-            VALUE "ProductVersion", "0, 8, 0, 1"
+            VALUE "ProductVersion", "0, 8, 0, 2"
         END
     END
     BLOCK "VarFileInfo"