aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/nant-color
diff options
context:
space:
mode:
authorMelanie2013-01-11 02:13:10 +0000
committerMelanie2013-01-11 02:13:10 +0000
commitf74915ed4f8831344ee588d9036b7ac866ea4294 (patch)
tree5f1021165cf4acc9043b3015c2aac468128fa1dc /nant-color
parentMerge branch 'master' into careminster (diff)
parentFix a regression in the last few scene commands changes where setting these v... (diff)
downloadopensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.zip
opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.gz
opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.bz2
opensim-SC_OLD-f74915ed4f8831344ee588d9036b7ac866ea4294.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'nant-color')
0 files changed, 0 insertions, 0 deletions