aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-04-02 13:46:21 +0000
committermarha <marha@users.sourceforge.net>2010-04-02 13:46:21 +0000
commit0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b (patch)
tree7f9e41630a661eaab39bef9023c2661a7281af96 /include
parent8def4a30414ae76e228f285ccab8bba6de083d08 (diff)
downloadvcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.gz
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.tar.bz2
vcxsrv-0e9df5cfcee1ab569d7b41ea1af4eab3e31f099b.zip
svn merge -r522:HEAD ^/branches/released .
Diffstat (limited to 'include')
-rw-r--r--include/dix-config.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dix-config.h b/include/dix-config.h
index 93194b06f..a6548b67c 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -396,7 +396,7 @@
#undef XORG_RELEASE
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((7) * 100000) + ((99) * 1000) + 902)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((8) * 100000) + ((0) * 1000) + 0)
/* Xorg release date */
#define XORG_DATE "10 Sept 2009"