summaryrefslogtreecommitdiff
path: root/progs/trivial/Makefile
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-10-17 14:13:00 -0600
committerBrian Paul <brian.paul@tungstengraphics.com>2008-10-17 14:13:00 -0600
commit87a6fe57e85ea5f273e808211a0e61d2b837b8e2 (patch)
tree0ed8f21ce93e75f21b41bad302bfc057255bb17d /progs/trivial/Makefile
parentb50a0b89d946cac3c18a84c3a77cc8dcf96eeec7 (diff)
parentd422c1eb5c0fac8f946758ecce96072505c77683 (diff)
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts: progs/trivial/tri.c
Diffstat (limited to 'progs/trivial/Makefile')
0 files changed, 0 insertions, 0 deletions