diff options
| author | Melanie | 2012-06-28 03:21:08 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-28 03:21:08 +0100 |
| commit | 41a1903c60475fc2d98b1b11d336a3ecee0bc150 (patch) | |
| tree | 0e78852eee96e9506b815cea0abbd35ac7da7f1a /bin/assets/AssetSets.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Avoid reporting false positives when a colon is in a comment in the first lin... (diff) | |
| download | opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.zip opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.gz opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.bz2 opensim-SC-41a1903c60475fc2d98b1b11d336a3ecee0bc150.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'bin/assets/AssetSets.xml')
0 files changed, 0 insertions, 0 deletions