[X2Go-Commits] [vcxsrv] 18/24: Increase version string to 1.15.2.1-xp+vc2013+x2go1

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 1.15.2.2-xp+vc2013+x2go1
in repository vcxsrv.

commit 13991a15faa9e5623e4b4fba8795bb7aac115dc9
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Oct 18 21:15:00 2014 -0400

    Increase version string to 1.15.2.1-xp+vc2013+x2go1
---
 include/dix-config.h                      |    2 +-
 xorg-server/hw/xwin/XWin.rc               |    4 ++--
 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, 7 insertions(+), 7 deletions(-)

diff --git a/include/dix-config.h b/include/dix-config.h
index beca209..b1d7285 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) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((15) * 100000) + ((2) * 1000) + 1)
 
 /* 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 ffcee3f..a23cdf9 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -45,9 +45,9 @@ FONT 8, "MS Shell Dlg 2"
 BEGIN
   CONTROL			IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32
   LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8
-  LTEXT			"https://sourceforge.net/u/mikedep333/vcxsrv/ci/master/tree/", IDC_STATIC, 36, 18, 220, 8
+  LTEXT			"https://sourceforge.net/u/mikedep333/vcxsrv/ci/xp-latestmsvc2013-x2gochanges/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.0-xp+vc2013+x2go1 (2 Sept 2014)", IDC_STATIC, 36, 38, 220, 8
+  LTEXT			"Version 1.15.2.1-xp+vc2013+x2go1 (18 Oct 2014)", 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 355be58..a4cad24 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-64-debug.1.15.2.0-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-64-debug.1.15.2.1-xp+vc2013+x2go1.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 5440a56..03ab0f6 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-64.1.15.2.0-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-64.1.15.2.1-xp+vc2013+x2go1.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 ffc83ea..8fbd8fe 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-debug.1.15.2.0-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv-debug.1.15.2.1-xp+vc2013+x2go1.installer.exe"
 
 ; The default installation directory
 InstallDir $PROGRAMFILES32\VcXsrv
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index e3b3f45..12cf4bf 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.1.15.2.0-xp+vc2013+x2go1.installer.exe"
+OutFile "vcxsrv.1.15.2.1-xp+vc2013+x2go1.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