diff options
| author | Melanie | 2012-04-20 16:48:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-20 16:48:43 +0100 |
| commit | 464fb2533f29c98cba27d7a99529e49c8c108d7d (patch) | |
| tree | 233543c1aee30a17352028489b92ac350969a2b2 /bin/assets | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Always dispose of existing opened bitmap from file in SaveFile(), instead of ... (diff) | |
| download | opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.zip opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.tar.gz opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.tar.bz2 opensim-SC-464fb2533f29c98cba27d7a99529e49c8c108d7d.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
Diffstat (limited to 'bin/assets')
0 files changed, 0 insertions, 0 deletions