diff options
author | David Nusinow <[email protected]> | 2005-12-14 01:43:13 +0000 |
---|---|---|
committer | David Nusinow <[email protected]> | 2005-12-14 01:43:13 +0000 |
commit | 92ef7527d17bcd8b59438a8f5e0fbb3e62579710 (patch) | |
tree | 0357d4d4809fb31dad31054099cb56358a382c7b /configs | |
parent | c37d6b4ca8a9a7ac42a2e0082cf1bb0acbbff3cc (diff) |
* New upstream version (6.4.1)
* Merge changes from Ubuntu version 6.4.1-0ubuntu1
+ Add new files required by xorg-server GL build to mesa-swrast-source.
Diffstat (limited to 'configs')
-rw-r--r-- | configs/CVS/Entries | 8 | ||||
-rw-r--r-- | configs/default | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configs/CVS/Entries b/configs/CVS/Entries index 96216682d01..a1be3698aa4 100644 --- a/configs/CVS/Entries +++ b/configs/CVS/Entries @@ -23,10 +23,8 @@ /irix6-n32-static/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch /irix6-o32/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch /irix6-o32-static/1.3/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux/1.4/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch /linux-alpha/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch /linux-alpha-static/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-debug/1.6/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch /linux-directfb/1.1/Mon Jan 3 15:35:01 2005//Tmesa_6_4_branch /linux-dri-ppc/1.3/Fri Aug 19 20:20:03 2005//Tmesa_6_4_branch /linux-dri-x86/1.11/Fri Jul 15 14:31:31 2005//Tmesa_6_4_branch @@ -50,7 +48,6 @@ /linux-static/1.3/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch /linux-tcc/1.5/Sat Nov 27 04:50:34 2004//Tmesa_6_4_branch /linux-ultrasparc/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch -/linux-x86/1.6/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch /linux-x86-32/1.4/Fri Jul 8 21:55:56 2005//Tmesa_6_4_branch /linux-x86-64/1.9/Sat Jul 2 08:29:57 2005//Tmesa_6_4_branch /linux-x86-64-debug/1.2/Sat Jul 2 07:38:40 2005//Tmesa_6_4_branch @@ -72,7 +69,10 @@ /sunos5-smp/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch /ultrix-gcc/1.2/Mon Sep 13 21:04:48 2004//Tmesa_6_4_branch /freebsd/1.2.8.1/Mon Aug 29 22:44:20 2005//Tmesa_6_4_branch -/default/1.21.2.1/Sat Sep 10 16:44:24 2005//Tmesa_6_4_branch /linux-dri/1.34/Wed Oct 19 01:51:53 2005//Tmesa_6_4_branch /freebsd-dri/1.12.2.1/Mon Oct 24 23:11:57 2005//Tmesa_6_4_branch +/default/1.21.2.2/Mon Oct 24 23:35:14 2005//Tmesa_6_4_branch +/linux-debug/1.6/Wed Nov 2 15:55:04 2005//Tmesa_6_4_branch +/linux-x86/1.6/Wed Nov 2 19:44:59 2005//Tmesa_6_4_branch +/linux/1.4/Mon Nov 21 16:05:02 2005//Tmesa_6_4_branch D diff --git a/configs/default b/configs/default index 571b76e4c70..e3b1bc0ecb5 100644 --- a/configs/default +++ b/configs/default @@ -8,7 +8,7 @@ CONFIG_NAME = default # Version info MESA_MAJOR=6 MESA_MINOR=4 -MESA_TINY=0 +MESA_TINY=1 # external projects. This should be useless now that we use libdrm. DRM_SOURCE_PATH=$(TOP)/../drm |