diff options
| author | Melanie | 2012-07-25 18:19:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-25 18:19:12 +0100 |
| commit | 6930d696e9961c5a4ecf1c06ebc7e72ec579876d (patch) | |
| tree | 325bc4ed1733cf26d6ff824e44d325d78507c0f5 /.gitignore | |
| parent | Remove support for the OS_NPC constant. That one seems to be overly paranoid (diff) | |
| parent | Rename "image queues clear" console command to "clear image queues" (diff) | |
| download | opensim-SC_OLD-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.zip opensim-SC_OLD-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.tar.gz opensim-SC_OLD-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.tar.bz2 opensim-SC_OLD-6930d696e9961c5a4ecf1c06ebc7e72ec579876d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions