diff options
| author | Jesse Barnes <jbarnes@jbarnes-t61.(none)> | 2008-08-05 13:02:47 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-05 13:02:47 -0700 |
| commit | 4f1f30854260e18b8b9c4103eebbad5dcf729ce6 (patch) | |
| tree | c3fdc92c76fee35fee4e6e8b37d3aa45672e3c37 /configure.ac | |
| parent | e9e6b4738573ffa3822ae68088bd53a645eedbce (diff) | |
| parent | 2aaa207db2cea03ba05c439b5074807689f2c5be (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
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 254fef4b..db16c356 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-intel], - 2.2.0, + 2.4.99.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-intel) |