diff options
| author | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
|---|---|---|
| committer | Thomas Balling Sørensen <tball@tball-laptop.(none)> | 2010-10-26 12:49:41 +0200 |
| commit | dbf3a15313eed930a3d8fdde12e457259c43651b (patch) | |
| tree | 78bc54fa866ff1e97e61802f52dabe3f4f3380b1 /src/gallium/targets/xorg-i915 | |
| parent | 1dccc4cfaa423f15ab582d2a0253a84a0ae0b9fa (diff) | |
| parent | 547e7619aac74ae13bdaa7fdf403a4ceb5212467 (diff) | |
Merge branch 'master' into pipe-video
Conflicts:
src/gallium/include/pipe/p_format.h
Diffstat (limited to 'src/gallium/targets/xorg-i915')
0 files changed, 0 insertions, 0 deletions