diff options
| author | Michel Daenzer <daenzer@loki.lorrainebruecke.local> | 2006-07-26 16:02:07 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-08-03 12:45:08 +0200 |
| commit | 9de55a44f95f251df365f29884a1ff17492b470d (patch) | |
| tree | c7db65f228ee6ac495020921d6f7d0c014b61e4e /ChangeLog | |
| parent | d140055f5be6185f634f7d13683c36ed698eb89a (diff) | |
Merge branch 'master' of ssh+git://git.freedesktop.org/git/xorg/driver/xf86-video-intel into i810_texman_0_1_branchi810_texman_0_1_branch
Conflicts:
ChangeLog - removed
src/i810_driver.c
src/i830_dri.c
src/i830_driver.c
src/i830_memory.c
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index c1875424..00000000 --- a/ChangeLog +++ /dev/null @@ -1,65 +0,0 @@ -2006-03-24 Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> - - * src/i830_driver.c: (I830BIOSCloseScreen): - Fix typo. - -2006-03-22 Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> - - * src/i810_driver.c: - * src/i830_dri.c: (I830DRIDoMappings): - * src/i830_driver.c: (I830DrmMMInit), (I830DrmMMTakedown), - (I830BIOSScreenInit), (I830BIOSCloseScreen): - * src/i830_memory.c: (I830Allocate3DMemory), (I830FixupOffsets), - (I830BindGARTMemory), (I830UnbindGARTMemory): - New branch. Initialize the drm memory manager. Don't allocate - texture memory. - -2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version for X11R7 release. - -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for final X11R7 release candidate. - -2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * man/Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC3 release. - -2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Remove extraneous AC_MSG_RESULT. - -2005-11-30 Adam Jackson <ajax@freedesktop.org> - - * configure.ac: - Bump libdrm dep to 2.0. - -2005-11-29 Adam Jackson <ajax@freedesktop.org> - - * configure.ac: - Only build dlloader modules by default. - -2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update dependencies to work with separate build roots. - -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update package version number for X11R7 RC2 release. - -2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> - - * configure.ac: - Update pkgcheck dependencies to work with separate build roots. |