diff options
| author | Melanie | 2012-07-28 00:39:36 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-28 00:39:36 +0100 |
| commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
| tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /.gitignore | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
| download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
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 |