diff options
| author | ubit | 2012-08-02 18:21:08 +0200 |
|---|---|---|
| committer | ubit | 2012-08-02 18:21:08 +0200 |
| commit | 254d3e1ad31f99770074abb49fec03c90d99b246 (patch) | |
| tree | fe2d2337f0fffec0f44a9f35442d73c8fe78fda3 /.gitignore | |
| parent | i local libs commit (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.zip opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.gz opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.bz2 opensim-SC-254d3e1ad31f99770074abb49fec03c90d99b246.tar.xz | |
merge crap gerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Conflicts:
bin/Regions/Regions.ini.example
bin/lib32/BulletSim.dll
bin/lib32/libBulletSim.so
bin/lib64/BulletSim.dll
bin/lib64/libBulletSim.so
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -44,6 +44,8 @@ bin/Physics* | |||
| 44 | bin/Terrain* | 44 | bin/Terrain* |
| 45 | bin/Regions/* | 45 | bin/Regions/* |
| 46 | bin/UserAssets | 46 | bin/UserAssets |
| 47 | bin/assetcache | ||
| 48 | bin/maptiles | ||
| 47 | bin/estate_settings.xml | 49 | bin/estate_settings.xml |
| 48 | bin/config-include/CenomeCache.ini | 50 | bin/config-include/CenomeCache.ini |
| 49 | bin/config-include/FlotsamCache.ini | 51 | bin/config-include/FlotsamCache.ini |