Mesa (master): Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-21 Thread Ian Romanick
Module: Mesa Branch: master Commit: 48302e9b309c7ce218de2e522c91bdc87e61cdbc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48302e9b309c7ce218de2e522c91bdc87e61cdbc Author: Ian Romanick Date: Mon Dec 21 18:27:24 2009 -0800 Merge branch 'mesa_7_6_branch' into mesa_7_7_branch Conflic

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-11-03 Thread Brian Paul
Module: Mesa Branch: master Commit: 4bced42341d13303ae023957d3001a640cf7ea2d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4bced42341d13303ae023957d3001a640cf7ea2d Author: Brian Paul Date: Tue Nov 3 09:54:09 2009 -0700 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-28 Thread Brian Paul
Module: Mesa Branch: master Commit: 0ea575d721821262a862ceef010db9b1a8b4a6d9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0ea575d721821262a862ceef010db9b1a8b4a6d9 Author: Brian Paul Date: Wed Oct 28 18:27:25 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-28 Thread Brian Paul
Module: Mesa Branch: master Commit: 7d56caabe45e91a67096804c7e341d04d01db7aa URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d56caabe45e91a67096804c7e341d04d01db7aa Author: Brian Paul Date: Wed Oct 28 11:33:51 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: src/mesa/s

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-23 Thread Brian Paul
Module: Mesa Branch: master Commit: 46a784b7fd2dcab97c26d5ca02fb8f74945ba157 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=46a784b7fd2dcab97c26d5ca02fb8f74945ba157 Author: Brian Paul Date: Fri Oct 23 18:38:43 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-22 Thread Brian Paul
Module: Mesa Branch: master Commit: ab9d1011f5549502a4b960c2067cde69856a2719 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ab9d1011f5549502a4b960c2067cde69856a2719 Author: Brian Paul Date: Thu Oct 22 18:38:19 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch' of git+ssh://ag...@git. freedesktop.org/git/mesa/mesa

2009-10-22 Thread Alex Deucher
Module: Mesa Branch: master Commit: 5e77b61e393144e76fe0a280c3c5da2d36703bbb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5e77b61e393144e76fe0a280c3c5da2d36703bbb Author: Alex Deucher Date: Thu Oct 22 12:02:31 2009 -0400 Merge branch 'mesa_7_6_branch' of git+ssh://ag...@git.freed

Mesa (master): Merge branch 'mesa_7_6_branch' of git+ssh://ag...@git. freedesktop.org/git/mesa/mesa

2009-10-19 Thread Alex Deucher
Module: Mesa Branch: master Commit: 620270c76e7241fe4c391e31e3706468d708fe69 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=620270c76e7241fe4c391e31e3706468d708fe69 Author: Alex Deucher Date: Mon Oct 19 12:10:59 2009 -0400 Merge branch 'mesa_7_6_branch' of git+ssh://ag...@git.freed

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-14 Thread Brian Paul
Module: Mesa Branch: master Commit: 9fd7e9ef05955834e3c4de8a1dfa7ea1a868d762 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9fd7e9ef05955834e3c4de8a1dfa7ea1a868d762 Author: Brian Paul Date: Wed Oct 14 09:40:05 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-14 Thread Brian Paul
Module: Mesa Branch: master Commit: ce3801ab87ef6eb29e5b81c2acfdd102f7b9c0ae URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce3801ab87ef6eb29e5b81c2acfdd102f7b9c0ae Author: Brian Paul Date: Wed Oct 14 09:22:30 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-10 Thread Brian Paul
Module: Mesa Branch: master Commit: 57e3eb1b178e861dee7695c9a5e1c71a4333192d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=57e3eb1b178e861dee7695c9a5e1c71a4333192d Author: Brian Paul Date: Sat Oct 10 09:25:34 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-08 Thread Brian Paul
Module: Mesa Branch: master Commit: f67bc2e87255298ac22e8ccd98f482cc62d0ec26 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f67bc2e87255298ac22e8ccd98f482cc62d0ec26 Author: Brian Paul Date: Thu Oct 8 09:28:07 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: src/mesa/d

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-07 Thread Nicolai Hähnle
Module: Mesa Branch: master Commit: 5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b4c0b864a25fa193e7ba828cf5ce483ca05bd4e Author: Nicolai Hähnle Date: Wed Oct 7 20:39:22 2009 +0200 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-10-01 Thread Brian Paul
Module: Mesa Branch: master Commit: 5d2413fca4c252ec5c7880fa7f983b5df3d762ba URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d2413fca4c252ec5c7880fa7f983b5df3d762ba Author: Brian Paul Date: Thu Oct 1 13:35:42 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-29 Thread Brian Paul
Module: Mesa Branch: master Commit: 124f5875eae0b914d5c679fec6b25633907ad843 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=124f5875eae0b914d5c679fec6b25633907ad843 Author: Brian Paul Date: Tue Sep 29 09:46:49 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: Makefile

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-28 Thread Ian Romanick
Module: Mesa Branch: master Commit: 41865d991f5703b6a9faa33ee6ac1d256af5c2a2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=41865d991f5703b6a9faa33ee6ac1d256af5c2a2 Author: Ian Romanick Date: Mon Sep 28 12:03:23 2009 -0700 Merge branch 'mesa_7_6_branch' Conflicts: Makefile

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-28 Thread Brian Paul
Module: Mesa Branch: master Commit: 8fda97afb8b7a03415dbca6d83691d2d6461126c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fda97afb8b7a03415dbca6d83691d2d6461126c Author: Brian Paul Date: Mon Sep 28 10:02:20 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-25 Thread Brian Paul
Module: Mesa Branch: master Commit: ecf3091cc78638919f1977ccc0307c51b6731385 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ecf3091cc78638919f1977ccc0307c51b6731385 Author: Brian Paul Date: Fri Sep 25 09:00:19 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: src/mesa/d

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-24 Thread Brian Paul
Module: Mesa Branch: master Commit: 29d27229a95837d085db785a2b4abb654457dafa URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=29d27229a95837d085db785a2b4abb654457dafa Author: Brian Paul Date: Thu Sep 24 16:06:21 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: src/mesa/v

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-24 Thread Pauli Nieminen
Module: Mesa Branch: master Commit: fd56bee6c4de28da194333f93b52c40f1deb6163 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fd56bee6c4de28da194333f93b52c40f1deb6163 Author: Pauli Nieminen Date: Thu Sep 24 20:39:01 2009 +0300 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-23 Thread Brian Paul
Module: Mesa Branch: master Commit: de25f82067bca5231fb968190f6c12cb517d62ff URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=de25f82067bca5231fb968190f6c12cb517d62ff Author: Brian Paul Date: Wed Sep 23 11:00:04 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: src/galliu

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-22 Thread Brian Paul
Module: Mesa Branch: master Commit: 02f2bcdf1d28f2bd6382fb6048c497ef76ba86b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02f2bcdf1d28f2bd6382fb6048c497ef76ba86b2 Author: Brian Paul Date: Tue Sep 22 16:06:18 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-21 Thread Nicolai Hähnle
Module: Mesa Branch: master Commit: 3083ba38f4c884b32cd0460607b5064b6b7008d2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3083ba38f4c884b32cd0460607b5064b6b7008d2 Author: Nicolai Hähnle Date: Mon Sep 21 13:08:34 2009 +0200 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-21 Thread Michel Dänzer
Module: Mesa Branch: master Commit: c67bb22fe7b4a7176efd9177d8de413d7c1a9192 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c67bb22fe7b4a7176efd9177d8de413d7c1a9192 Author: Michel Dänzer Date: Mon Sep 21 10:48:32 2009 +0200 Merge branch 'mesa_7_6_branch' ---

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-20 Thread Brian Paul
Module: Mesa Branch: master Commit: ebf2710b2fd21ae9a6604c015ca7a948589f5a8c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebf2710b2fd21ae9a6604c015ca7a948589f5a8c Author: Brian Paul Date: Sun Sep 20 10:36:45 2009 -0600 Merge branch 'mesa_7_6_branch' Conflicts: src/mesa/dr

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-16 Thread Ian Romanick
Module: Mesa Branch: master Commit: 5ce72c559c027ea03513ed9c0038706733b0586e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ce72c559c027ea03513ed9c0038706733b0586e Author: Ian Romanick Date: Wed Sep 16 08:05:36 2009 -0700 Merge branch 'mesa_7_6_branch' --- _

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-15 Thread Ian Romanick
Module: Mesa Branch: master Commit: ac4e23d78415cfdd601a4e8d733075e946a70be9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ac4e23d78415cfdd601a4e8d733075e946a70be9 Author: Ian Romanick Date: Tue Sep 15 13:14:38 2009 -0700 Merge branch 'mesa_7_6_branch' --- _

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-15 Thread Brian Paul
Module: Mesa Branch: master Commit: 41bbc8395111c6ef37e08a63ee58876d10a09e77 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=41bbc8395111c6ef37e08a63ee58876d10a09e77 Author: Brian Paul Date: Tue Sep 15 09:47:35 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___

Mesa (master): Merge branch 'mesa_7_6_branch'

2009-09-10 Thread Brian Paul
Module: Mesa Branch: master Commit: d9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9dc4cb0e4f578da9e50c9d1ba6fd9c22ea2fca6 Author: Brian Paul Date: Thu Sep 10 15:41:52 2009 -0600 Merge branch 'mesa_7_6_branch' --- ___