aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Properties
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-20 22:11:04 +0000
committerJustin Clark-Casey (justincc)2013-02-20 22:11:04 +0000
commit99ebff94b5763d6b5a38bdcdb7c493a93ce9981a (patch)
tree0fcf1c81b5dff3eda856e036031454f8c765633f /OpenSim/Region/OptionalModules/Properties
parentCorrect mistake in parsing 'show object pos' and similar pos commands where t... (diff)
parentFix the JsonStore path set problem justincc found earlier today and (diff)
downloadopensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.zip
opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.gz
opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.bz2
opensim-SC-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules/Properties')
-rw-r--r--OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
index 0065531..70bda72 100644
--- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
+++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs
@@ -31,7 +31,7 @@ using Mono.Addins;
31// Revision 31// Revision
32// 32//
33[assembly: AssemblyVersion("0.7.6.*")] 33[assembly: AssemblyVersion("0.7.6.*")]
34[assembly: AssemblyFileVersion("1.0.0.0")] 34
35 35
36[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")] 36[assembly: Addin("OpenSim.Region.OptionalModules", "0.1")]
37[assembly: AddinDependency("OpenSim", "0.5")] 37[assembly: AddinDependency("OpenSim", "0.5")]