aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Manager/AssemblyInfo.cs
diff options
context:
space:
mode:
authorMelanie2013-03-03 13:24:37 +0000
committerMelanie2013-03-03 13:24:37 +0000
commitf39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch)
treea5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/Physics/Manager/AssemblyInfo.cs
parentMerge branch 'master' into careminster (diff)
parentMake Keyframe motion cross regions again (diff)
downloadopensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip
opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz
opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2
opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz
Merge branch 'avination' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Physics/Manager/AssemblyInfo.cs')
0 files changed, 0 insertions, 0 deletions