diff options
| author | Melanie | 2013-02-15 21:42:16 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-15 21:42:16 +0000 |
| commit | ea8c5ba707f0c6afd98968b68d13ab03b151b75b (patch) | |
| tree | 9b67be5dd03a8012fb832590b05c550f869601fa /bin/OpenMetaverse.dll.config | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
| download | opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.zip opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.gz opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.bz2 opensim-SC_OLD-ea8c5ba707f0c6afd98968b68d13ab03b151b75b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'bin/OpenMetaverse.dll.config')
0 files changed, 0 insertions, 0 deletions