diff options
author | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 01:11:25 +1000 |
commit | 53116910b10e3b8a05f42970eff311c21808699f (patch) | |
tree | 6831e50a56a02fed324f8cb119e05d837e00d7cf /progs/demos/texdown.c | |
parent | 7e104f9cde94279a902b408e8d1cf21779b393a8 (diff) | |
parent | 0ccbc3c905f0594a35d72887a1f115e148aaa596 (diff) |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
configure.ac
src/mesa/drivers/dri/r200/r200_context.c
src/mesa/drivers/dri/r300/r300_render.c
Diffstat (limited to 'progs/demos/texdown.c')
-rw-r--r-- | progs/demos/texdown.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/progs/demos/texdown.c b/progs/demos/texdown.c index 5fecd9a148..7e46045832 100644 --- a/progs/demos/texdown.c +++ b/progs/demos/texdown.c @@ -154,11 +154,6 @@ static unsigned long align(unsigned long value, unsigned long a) return (value + a - 1) & ~(a-1); } -static int MIN2(int a, int b) -{ - return a < b ? a : b; -} - static void MeasureDownloadRate(void) { |