diff options
| author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
| commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
| tree | 9173f9964c0fec4215514e622f705810730d0ce9 /.gitignore | |
| parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
| parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
| download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore index 074a92a397..bff5ead245 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,10 @@ lib*.a /MT32_CONTROL.ROM /MT32_PCM.ROM /ScummVM.app +/*.ipk /.project /.cproject +/.settings /backends/platform/dc/gui /backends/platform/dc/graphics @@ -86,24 +88,26 @@ lib*.a /doc/*.ps /doc/*.toc +/plugins + /test/runner /test/runner.cpp /test/*.dSYM -/tools/convbdf -/tools/md5table -/tools/make-scumm-fontdata -/tools/create_drascula/create_drascula -/tools/create_hugo/create_hugo -/tools/create_kyradat/create_kyradat -/tools/create_lure/create_lure -/tools/create_mads/create_mads -/tools/create_project/create_project -/tools/create_teenagent/create_teenagent -/tools/create_toon/create_toon -/tools/create_translations/create_translations -/tools/qtable/qtable -/tools/skycpt/skycpt +/devtools/convbdf +/devtools/md5table +/devtools/make-scumm-fontdata +/devtools/create_drascula/create_drascula +/devtools/create_hugo/create_hugo +/devtools/create_kyradat/create_kyradat +/devtools/create_lure/create_lure +/devtools/create_mads/create_mads +/devtools/create_project/create_project +/devtools/create_teenagent/create_teenagent +/devtools/create_toon/create_toon +/devtools/create_translations/create_translations +/devtools/qtable/qtable +/devtools/skycpt/skycpt #ignore thumbnails created by windows Thumbs.db |