summaryrefslogtreecommitdiff
path: root/docs/README.DJ
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2009-12-21 18:45:31 -0800
committerIan Romanick <ian.d.romanick@intel.com>2009-12-21 18:45:31 -0800
commita4b6b428855e73b35f754a9f64647c6edc1a88fa (patch)
tree45422f07630a8f36264fe43d9d325305bf8085bd /docs/README.DJ
parentef171051349ac83695a9a8304d486e1adb503291 (diff)
parent82184970d3aee822d945af7d4902359f28f7057f (diff)
Merge branch 'mesa_7_7_branch'
Conflicts: src/mesa/main/version.h
Diffstat (limited to 'docs/README.DJ')
0 files changed, 0 insertions, 0 deletions