diff options
| author | Melanie | 2012-02-19 21:14:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-19 21:14:18 +0000 |
| commit | 756baff86a751a96e485b218b21c472b704f430b (patch) | |
| tree | 9e59a0b0df7f5ba2a9ab15a0d25fda6aa7fb4142 /bin/assets/AssetSets.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-756baff86a751a96e485b218b21c472b704f430b.zip opensim-SC_OLD-756baff86a751a96e485b218b21c472b704f430b.tar.gz opensim-SC_OLD-756baff86a751a96e485b218b21c472b704f430b.tar.bz2 opensim-SC_OLD-756baff86a751a96e485b218b21c472b704f430b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'bin/assets/AssetSets.xml')
0 files changed, 0 insertions, 0 deletions