Merge pull request #1401 from folecr/gles20

Ignore userconf.ini when running from jenkins
This commit is contained in:
minggo 2012-09-26 18:24:10 -07:00
commit 216a47ab1b
1 changed files with 3 additions and 0 deletions

3
.gitignore vendored
View File

@ -77,4 +77,7 @@ Device-Release/
# Ignore config files in javascript bindings generator
tools/tojs/user.cfg
# ... userconf.ini generated if running from tools/tojs
tools/tojs/userconf.ini
# ... userconf.ini generated if running from tools/jenkins_scripts/mac/android/
tools/jenkins_scripts/mac/android/userconf.ini