diff options
| author | Justin Clark-Casey (justincc) | 2013-02-20 22:11:04 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-02-20 22:11:04 +0000 |
| commit | 99ebff94b5763d6b5a38bdcdb7c493a93ce9981a (patch) | |
| tree | 0fcf1c81b5dff3eda856e036031454f8c765633f /OpenSim/Addons | |
| parent | Correct mistake in parsing 'show object pos' and similar pos commands where t... (diff) | |
| parent | Fix the JsonStore path set problem justincc found earlier today and (diff) | |
| download | opensim-SC_OLD-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.zip opensim-SC_OLD-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.gz opensim-SC_OLD-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.bz2 opensim-SC_OLD-99ebff94b5763d6b5a38bdcdb7c493a93ce9981a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Addons')
| -rw-r--r-- | OpenSim/Addons/Groups/Properties/AssemblyInfo.cs | 3 | ||||
| -rw-r--r-- | OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs index 166803f..5ccd7fe 100644 --- a/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs +++ b/OpenSim/Addons/Groups/Properties/AssemblyInfo.cs | |||
| @@ -30,8 +30,7 @@ using Mono.Addins; | |||
| 30 | // Build Number | 30 | // Build Number |
| 31 | // Revision | 31 | // Revision |
| 32 | // | 32 | // |
| 33 | [assembly: AssemblyVersion("0.7.5.*")] | 33 | [assembly: AssemblyVersion("0.7.6.*")] |
| 34 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
| 35 | 34 | ||
| 36 | [assembly: Addin("OpenSim.Groups", "0.1")] | 35 | [assembly: Addin("OpenSim.Groups", "0.1")] |
| 37 | [assembly: AddinDependency("OpenSim", "0.5")] | 36 | [assembly: AddinDependency("OpenSim", "0.5")] |
diff --git a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs index 31667eb..ffe8a3e 100644 --- a/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs +++ b/OpenSim/Addons/OfflineIM/Properties/AssemblyInfo.cs | |||
| @@ -30,8 +30,7 @@ using Mono.Addins; | |||
| 30 | // Build Number | 30 | // Build Number |
| 31 | // Revision | 31 | // Revision |
| 32 | // | 32 | // |
| 33 | [assembly: AssemblyVersion("0.7.5.*")] | 33 | [assembly: AssemblyVersion("0.7.6.*")] |
| 34 | [assembly: AssemblyFileVersion("1.0.0.0")] | ||
| 35 | 34 | ||
| 36 | [assembly: Addin("OpenSim.OfflineIM", "0.1")] | 35 | [assembly: Addin("OpenSim.OfflineIM", "0.1")] |
| 37 | [assembly: AddinDependency("OpenSim", "0.5")] | 36 | [assembly: AddinDependency("OpenSim", "0.5")] |