[X2Go-Commits] [vcxsrv] 06/06: Increase version string to 1.15.2.3

git-admin at x2go.org git-admin at x2go.org
Mon Mar 9 05:12:21 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to tag 1.15.2.3-xp+vc2013
in repository vcxsrv.

commit 9080263ab40350c9c896095dca2973597c20be52
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Fri Feb 20 06:35:11 2015 -0500

    Increase version string to 1.15.2.3
    
    Conflicts:
    	xorg-server/hw/xwin/XWin.rc
    	xorg-server/installer/vcxsrv-64-debug.nsi
    	xorg-server/installer/vcxsrv-64.nsi
    	xorg-server/installer/vcxsrv-debug.nsi
    	xorg-server/installer/vcxsrv.nsi
---
 include/dix-config.h                      |    2 +-
 xorg-server/hw/xwin/XWin.rc               |    2 +-
 xorg-server/installer/vcxsrv-64-debug.nsi |    2 +-
 xorg-server/installer/vcxsrv-64.nsi       |    2 +-
 xorg-server/installer/vcxsrv-debug.nsi    |    2 +-
 xorg-server/installer/vcxsrv.nsi          |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/dix-config.h b/include/dix-config.h
index 34bed96..c571d2e 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -366,7 +366,7 @@
 #undef XORG_RELEASE
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((2) * 1000) + 2)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((2) * 1000) + 3)
 
 /* Xorg release date */
 #define XORG_DATE "10 Sept 2009"
diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index 07f8820..901a404 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -47,7 +47,7 @@ BEGIN
   LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8
   LTEXT			"https://sourceforge.net/u/mikedep333/vcxsrv/ci/xp-latestmsvc2013/tree/", IDC_STATIC, 36, 18, 220, 8
   LTEXT			"x2go-dev at lists.x2go.org", IDC_STATIC, 36, 28, 220, 8
-  LTEXT			"Version 1.15.2.2-xp+vc2013 (10 Jan 2015)", IDC_STATIC, 36, 38, 220, 8
+  LTEXT			"Version 1.15.2.3-xp+vc2013 (20 Feb 2015)", IDC_STATIC, 36, 38, 220, 8
   DEFPUSHBUTTON		"OK", IDOK, 105, 75, 50, 15
 END
 
diff --git a/xorg-server/installer/vcxsrv-64-debug.nsi b/xorg-server/installer/vcxsrv-64-debug.nsi
index 73c662a..e76e88f 100644
--- a/xorg-server/installer/vcxsrv-64-debug.nsi
+++ b/xorg-server/installer/vcxsrv-64-debug.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv - XP Compatible"
 
 ; The file to write
-OutFile "vcxsrv-xp-64-debug.1.15.2.2.installer.exe"
+OutFile "vcxsrv-xp-64-debug.1.15.2.3.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES64\VcXsrv
diff --git a/xorg-server/installer/vcxsrv-64.nsi b/xorg-server/installer/vcxsrv-64.nsi
index 33ca041..f3f52f7 100644
--- a/xorg-server/installer/vcxsrv-64.nsi
+++ b/xorg-server/installer/vcxsrv-64.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv - XP Compatible"
 
 ; The file to write
-OutFile "vcxsrv-xp-64.1.15.2.2.installer.exe"
+OutFile "vcxsrv-xp-64.1.15.2.3.installer.exe"
 
 ; The default installation directory
 InstallDir $programfiles64\VcXsrv
diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi
index 4890ba0..5ef0ea3 100644
--- a/xorg-server/installer/vcxsrv-debug.nsi
+++ b/xorg-server/installer/vcxsrv-debug.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv - XP Compatible"
 
 ; The file to write
-OutFile "vcxsrv-xp-debug.1.15.2.2.installer.exe"
+OutFile "vcxsrv-xp-debug.1.15.2.3.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES32\VcXsrv
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index f8bf6d5..ba1c36a 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -21,7 +21,7 @@
 Name "VcXsrv - XP Compatible"
 
 ; The file to write
-OutFile "vcxsrv-xp.1.15.2.2.installer.exe"
+OutFile "vcxsrv-xp.1.15.2.3.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES32\VcXsrv

--
Alioth's /srv/git/code.x2go.org/vcxsrv.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/vcxsrv.git


More information about the x2go-commits mailing list