diff options
author | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-06 09:28:52 +0100 |
---|---|---|
committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-03-06 09:28:52 +0100 |
commit | 6c299aea8e87e72c68c96c03594706c976601ede (patch) | |
tree | 9fc7d6b2a1acc764ad35e2d24e91434aeeba9300 /configure.ac | |
parent | 330815251dee808754b328cd2fd60db39f2460eb (diff) | |
parent | 4042b27f01fdb94e7fc0d4e991e054fff88479ea (diff) |
Merge remote branch 'origin/master' into i830-pageflip
Conflicts:
src/i830_display.c
src/i830_driver.c
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 255ccf83..fbb9c647 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 1.9.90, + 1.9.91, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) |