Merge pull request #9 from OCSInventory-NG/update_2_4

update changelog and version to 2.4

Author: gillesdubois

CHANGELOG

@@ -1,3 +1,6 @@
+2.4
+  * Fix logfile bug
+  * Fix install dir
 2.3
   * Fix bugs
   * Update graphics chart

OCS_DEPLOY_TOOL.rc

@@ -13,7 +13,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Neutral (Default) resources
+// Neutre (Par d�faut) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
 LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
@@ -28,6 +28,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 // remains consistent on all systems.
 IDR_MAINFRAME           ICON                    "res\\OCSInventory.ico"
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
@@ -453,12 +454,12 @@ BEGIN
                             "Host <%1> Trying to get remote ""ProgramData"" directory using PsExec..."
 END
 
-#endif    // Neutral (Default) resources
+#endif    // Neutre (Par d�faut) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// English (United States) resources
+// Anglais (�tats-Unis) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -470,8 +471,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,0,0
- PRODUCTVERSION 2,3,0,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -489,13 +490,13 @@ BEGIN
             VALUE "Comments", "Inventory and Deployment Tool released under GNU General Public License"
             VALUE "CompanyName", "http://www.ocsinventory-ng.org"
             VALUE "FileDescription", "OCS Inventory NG Agent Deployment Tool for Windows"
-            VALUE "FileVersion", "2.3.0.0"
+            VALUE "FileVersion", "2.4.0.0"
             VALUE "InternalName", "ocsinventory-deploy-tool"
             VALUE "LegalCopyright", "Open Source Software under GNU General Public License"
             VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
             VALUE "OriginalFilename", "ocsinventory-deploy-tool.exe"
             VALUE "ProductName", "OCS Inventory NG"
-            VALUE "ProductVersion", "2.3.0.0"
+            VALUE "ProductVersion", "2.4.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -504,12 +505,12 @@ BEGIN
     END
 END
 
-#endif    // English (United States) resources
+#endif    // Anglais (�tats-Unis) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// French (France) resources
+// Fran�ais (France) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
@@ -552,7 +553,7 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // French (France) resources
+#endif    // Fran�ais (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

Setup/setup.nsi

@@ -10,7 +10,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "OCS Inventory NG Agent Deployment Tool"
-!define PRODUCT_VERSION "2.3.0.0"
+!define PRODUCT_VERSION "2.4.0.0"
 !define PRODUCT_PUBLISHER "OCS Inventory NG"
 !define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\ocsinventory-deploy-tool.exe"