summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-08 01:51:12 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-08 01:51:12 +0000
commit6617fece6a6174daf7cb98d2d2d3c7d5bbc5c574 (patch)
treee17957e24d14bf4463de84ba8c69536d3d3a3138
parentd9b3680a0ef046a18cb1c910f214336ab764d2ed (diff)
Bump to 1.2.1 for Xv changes.trident-1_2_1XORG-7_1
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
-rw-r--r--src/trident_driver.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d68d208..4809cab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/trident_driver.c:
+ Bump to 1.2.1 for Xv changes.
+
2006-04-07 Aaron Plattner <aplattner@nvidia.com>
* src/trident_video.c: (TRIDENTPutImage):
diff --git a/configure.ac b/configure.ac
index 9e15719..5a68d3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
diff --git a/src/trident_driver.c b/src/trident_driver.c
index baa3461..0eeba7b 100644
--- a/src/trident_driver.c
+++ b/src/trident_driver.c
@@ -117,7 +117,7 @@ static int pix24bpp = 0;
#define TRIDENT_DRIVER_NAME "trident"
#define TRIDENT_MAJOR_VERSION 1
#define TRIDENT_MINOR_VERSION 2
-#define TRIDENT_PATCHLEVEL 0
+#define TRIDENT_PATCHLEVEL 1
/*
* This contains the functions needed by the server after loading the driver