Merge master and fix conflicts
[mesa.git] / src / gallium / winsys / drm / nouveau / dri / Makefile
2009-06-12 Alex DeucherMerge master and fix conflicts
2009-06-12 Jakob BornecrantzMerge branch 'mesa_7_5_branch'
2009-06-11 José FonsecaMerge branch 'mesa_7_5_branch'
2009-06-11 José FonsecaMerge branch 'mesa_7_5_branch'
2009-06-09 Jakob BornecrantzMerge branch 'mesa_7_5_branch'
2009-06-07 Dave AirlieMerge remote branch 'origin/master' into radeon-rewrite
2009-06-05 Ben Skeggsnouveau: add pipe_buffer/fence code to pipe drivers...
2009-06-04 Brian PaulMerge branch 'mesa_7_5_branch'
2009-06-01 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-31 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-22 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-22 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-22 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-21 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-19 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-18 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-13 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-13 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-11 Brian PaulMerge branch 'mesa_7_5_branch'
2009-05-10 Jerome GlisseMerge commit 'origin/master' into radeon-rewrite
2009-05-07 Ben Skeggsnouveau: remove dri1 code now we're using the dri state...
2009-03-20 Dave AirlieMerge remote branch 'main/master' into radeon-rewrite
2009-03-17 Ben Skeggsnouveau: rewrite winsys in terms of drm_api, support...
2009-03-03 José FonsecaMerge commit 'origin/gallium-0.1'
2009-03-03 Keith WhitwellMerge commit 'origin/gallium-0.1'
2009-02-23 José FonsecaMerge commit 'origin/gallium-0.1'
2009-02-19 Ben Skeggsnouveau: reenable all the non-nv50 pipe drivers
2009-02-19 Ben Skeggsnv50: rework for texture_transfer changes
2009-02-18 Keith WhitwellMerge commit 'origin/gallium-0.1'
2009-02-16 Keith WhitwellMerge branch 'master' into gallium-texture-transfer
2009-02-12 Dave AirlieMerge remote branch 'origin/master' into radeon-rewrite
2009-02-10 Brian PaulMerge commit 'origin/gallium-master-merge'
2009-02-09 Brian Paulmesa: merge gallium-0.2 into gallium-master-merge
2009-02-06 Corbin SimpsonMerge branch 'gallium-0.2-radeon' into gallium-0.2
2009-02-04 Ben Skeggsnouveau: link against libdrm_nouveau (installed with...
2009-01-22 Alan HourihaneMerge commit 'origin/master' into gallium-0.2
2009-01-16 Alan HourihaneMerge commit 'origin/master' into gallium-0.2
2009-01-14 Alan HourihaneMerge commit 'origin/master' into gallium-0.2
2009-01-11 Keith WhitwellMerge commit 'origin/gallium-0.2' into gallium-xlib...
2009-01-10 Younes Mantonnouveau: Factor out common winsys bits into libnouveaudrm.a