diff options
| author | Melanie | 2013-01-04 22:39:07 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-04 22:39:07 +0000 |
| commit | e62b14024f35121f1fd83bd6d3cd572ed9ba5897 (patch) | |
| tree | 987892e6227b79eb45d48c5df0f8b9acfdf30755 /.gitignore | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Set default particle burst count to 1 instead of 0 in any set particle system... (diff) | |
| download | opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.zip opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.gz opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.bz2 opensim-SC-e62b14024f35121f1fd83bd6d3cd572ed9ba5897.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
| @@ -98,3 +98,5 @@ OpenSim/Region/ScriptEngine/test-results/ | |||
| 98 | OpenSim/Tests/Common/test-results/ | 98 | OpenSim/Tests/Common/test-results/ |
| 99 | OpenSim/Tests/test-results/ | 99 | OpenSim/Tests/test-results/ |
| 100 | test-results/ | 100 | test-results/ |
| 101 | doc/html | ||
| 102 | doc/doxygen.error.log | ||