On 23.10.2014 04:27, Emil Velikov wrote:
Trivial merge conflicts
-----------------------
Here are the commits where I manually merged conflicts, (so these might
merit additional review):
commit c759d1b6bfbc15b044ef3f7cd590b6647c3670df
Author: Michel Dänzer <michel.daen...@amd.com>
winsys/radeon: Use separate caching buffer manager for each set of flags
(cherry picked from commit 3ede67a4c6d77892296ffc5568ddf3accaa1af99)
Looks good, FWIW.
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
