Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-28 Thread Ian Romanick
Module: Mesa
Branch: mesa_7_6_branch
Commit: d39fd9f641df7da77ff6158c5aa249dd90bf420d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d39fd9f641df7da77ff6158c5aa249dd90bf420d

Author: Ian Romanick ian.d.roman...@intel.com
Date:   Mon Sep 28 12:02:39 2009 -0700

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
src/mesa/main/version.h

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-24 Thread Brian Paul
Module: Mesa
Branch: mesa_7_6_branch
Commit: 7549a8397b310acf672f97a08c8e7d866cdf492c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=7549a8397b310acf672f97a08c8e7d866cdf492c

Author: Brian Paul bri...@vmware.com
Date:   Thu Sep 24 10:52:15 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-24 Thread Brian Paul
Module: Mesa
Branch: mesa_7_6_branch
Commit: 940ca2e837efe45caae1cf1d9665f6736347705d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=940ca2e837efe45caae1cf1d9665f6736347705d

Author: Brian Paul bri...@vmware.com
Date:   Thu Sep 24 16:01:26 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-22 Thread Brian Paul
Module: Mesa
Branch: mesa_7_6_branch
Commit: ba002eb1965ccdb09d7c3657d32e22e71ed4096a
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba002eb1965ccdb09d7c3657d32e22e71ed4096a

Author: Brian Paul bri...@vmware.com
Date:   Tue Sep 22 13:44:43 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:

src/mesa/main/bufferobj.c

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-21 Thread Michel Dänzer
Module: Mesa
Branch: mesa_7_6_branch
Commit: 1d4dbd8d9b00cdba8c4aef4a3994d8763fea0dff
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d4dbd8d9b00cdba8c4aef4a3994d8763fea0dff

Author: Michel Dänzer daen...@vmware.com
Date:   Mon Sep 21 10:39:20 2009 +0200

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-21 Thread Brian Paul
Module: Mesa
Branch: mesa_7_6_branch
Commit: 6559eaef59526a7f4b2c22927637091018535c0c
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=6559eaef59526a7f4b2c22927637091018535c0c

Author: Brian Paul bri...@vmware.com
Date:   Mon Sep 21 14:49:46 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-20 Thread Nicolai Hähnle
Module: Mesa
Branch: mesa_7_6_branch
Commit: 82c2f7756af19f0a19aeda7ea1f627262e4561c0
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=82c2f7756af19f0a19aeda7ea1f627262e4561c0

Author: Nicolai Hähnle nhaeh...@gmail.com
Date:   Sun Sep 20 16:59:03 2009 +0200

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-16 Thread Ian Romanick
Module: Mesa
Branch: mesa_7_6_branch
Commit: 88e3a5760559e6ced00a57b7157abe156c22be2e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=88e3a5760559e6ced00a57b7157abe156c22be2e

Author: Ian Romanick ian.d.roman...@intel.com
Date:   Wed Sep 16 07:57:19 2009 -0700

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
src/mesa/main/dlist.c

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-15 Thread Brian Paul
Module: Mesa
Branch: mesa_7_6_branch
Commit: 5d526ed21ac9f1ec9220c2adb4c905893eb9d990
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d526ed21ac9f1ec9220c2adb4c905893eb9d990

Author: Brian Paul bri...@vmware.com
Date:   Tue Sep 15 09:45:18 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-10 Thread Ian Romanick
Module: Mesa
Branch: mesa_7_6_branch
Commit: 8398535331dae39ff5f52e94a69abdbf7507a343
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=8398535331dae39ff5f52e94a69abdbf7507a343

Author: Ian Romanick ian.d.roman...@intel.com
Date:   Thu Sep 10 11:24:56 2009 -0700

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:
src/mesa/drivers/dri/intel/intel_context.c

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit


Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

2009-09-10 Thread Brian Paul
Module: Mesa
Branch: mesa_7_6_branch
Commit: 4b1cbfcbe66161a7b56d56cd9e2c35ce49b3a91d
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b1cbfcbe66161a7b56d56cd9e2c35ce49b3a91d

Author: Brian Paul bri...@vmware.com
Date:   Thu Sep 10 15:40:26 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---



___
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit