diff options
author | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
---|---|---|
committer | Chia-I Wu <olvaffe@gmail.com> | 2010-01-12 11:25:02 +0800 |
commit | 562c127693200822f04a145db50add1be2425d7b (patch) | |
tree | 9441774fb212b17ddf2a364f06abc43f166cc00b /progs/.gitignore | |
parent | e5d351dcfde58777162552cf5cd2a9cd8299f4cd (diff) | |
parent | 077d6dd7508af88509dd0499c5dfbdaa186b4015 (diff) |
Merge branch 'master' into opengl-es-v2
Conflicts:
src/mesa/main/dd.h
Diffstat (limited to 'progs/.gitignore')
-rw-r--r-- | progs/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/progs/.gitignore b/progs/.gitignore new file mode 100644 index 0000000000..cb77d18a4b --- /dev/null +++ b/progs/.gitignore @@ -0,0 +1 @@ +*.dSYM |