diff options
| author | Gregor Aisch <contact@vis4.net> | 2013-02-13 15:44:15 +0400 |
|---|---|---|
| committer | Gregor Aisch <contact@vis4.net> | 2013-02-13 15:44:15 +0400 |
| commit | 37600f5b758d1ecc72159a3e0e41da30c2910cb4 (patch) | |
| tree | 0789e05dfe0efbc1f29030d17f0a9583ac6eaec1 /.gitignore | |
| parent | 4e47c8aba3bf146292f6e9d38aa0151c383e6c33 (diff) | |
| parent | aca5e95aa4f851e8313da8655becfc1b8e224227 (diff) | |
Merge remote-tracking branch 'upstream/master' into svg-map-widget
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 9b25a3cfff..dffb69b147 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,12 @@ tmp/* config/config.ini.php .DS_Store tests/PHPUnit/Integration/processed/ +js/yui* +misc/*.dat +tests/javascript/enable_sqlite +tests/javascript/unittest.dbf +tests/lib/geoip-files/ tests/lib/visualphpunit/app/resource/cache/ +tests/PHPUnit/Integration/processed/ +tests/PHPUnit/phpunit.xml tests/results/ -tests/lib/geoip-files/ |