xf86-video-intel: Branch 'mergedfb' - 3 commits - configure.ac src/i810.h src/i830_3d.c src/i830_dri.h src/i915_3d.c

[Alan Hourihane]

 configure.ac   |    2 +-
 src/i810.h     |    2 +-
 src/i830_3d.c  |    1 +
 src/i830_dri.h |    2 +-
 src/i915_3d.c  |    1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

New commits:
diff-tree e4f63eaf5efb654121db148f2f8e32cc3b23b6b5 (from parents)
Merge: 633a683a4adcb9a44a54519fd7ff66aab2d12f97 e26f3e30b30a57ab4aad0267d689a9a5d7a5e877
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Tue Aug 8 11:07:56 2006 +0100

    Merge branch 'master' of git+ssh://xorg.freedesktop.org/git/xorg/driver/xf86-video-intel

diff-tree e26f3e30b30a57ab4aad0267d689a9a5d7a5e877 (from b919db75d2f6dc1019f981534b0d5d87c6029727)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Jul 26 09:17:52 2006 +0100

    Fix a build problem

diff --git a/src/i830_3d.c b/src/i830_3d.c
index 0efd6e4..debad7c 100644
--- a/src/i830_3d.c
+++ b/src/i830_3d.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include "xf86.h"
 #include "i830.h"
 
 #include "i830_reg.h"
diff --git a/src/i915_3d.c b/src/i915_3d.c
index d8edb18..b1f30ef 100644
--- a/src/i915_3d.c
+++ b/src/i915_3d.c
@@ -29,6 +29,7 @@
 #include "config.h"
 #endif
 
+#include "xf86.h"
 #include "i830.h"
 
 #include "i915_reg.h"
diff-tree b919db75d2f6dc1019f981534b0d5d87c6029727 (from 84805167ab8a422966355b9753bfcb4dad802413)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date:   Wed Jul 26 09:07:19 2006 +0100

    Bump to 1.6.1

diff --git a/configure.ac b/configure.ac
index 82d3e55..b1d3524 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-i810],
-        1.6.0,
+        1.6.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-i810)
 
diff --git a/src/i810.h b/src/i810.h
index 044eb60..740f38c 100644
--- a/src/i810.h
+++ b/src/i810.h
@@ -66,7 +66,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #define I810_DRIVER_NAME "i810"
 #define I810_MAJOR_VERSION 1
 #define I810_MINOR_VERSION 6
-#define I810_PATCHLEVEL 0
+#define I810_PATCHLEVEL 1
 
 
 /* HWMC Surfaces */
diff --git a/src/i830_dri.h b/src/i830_dri.h
index 4f356d1..31232b8 100644
--- a/src/i830_dri.h
+++ b/src/i830_dri.h
@@ -10,7 +10,7 @@
 
 #define I830_MAJOR_VERSION 1
 #define I830_MINOR_VERSION 6
-#define I830_PATCHLEVEL 0
+#define I830_PATCHLEVEL 1
 
 #define I830_REG_SIZE 0x80000