diff options
| author | Melanie | 2013-04-28 19:03:39 +0200 |
|---|---|---|
| committer | Melanie | 2013-04-28 19:03:39 +0200 |
| commit | 4275d7a839d7380ee50aeadc38a31dd467bd891e (patch) | |
| tree | 1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Region/OptionalModules/Properties | |
| parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
| parent | Controller module for dynamic floaters (WIP) (diff) | |
| download | opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.zip opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.gz opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.bz2 opensim-SC-4275d7a839d7380ee50aeadc38a31dd467bd891e.tar.xz | |
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
bin/Regions/Regions.ini.example
Diffstat (limited to 'OpenSim/Region/OptionalModules/Properties')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs index 217b2d5..70bda72 100644 --- a/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs +++ b/OpenSim/Region/OptionalModules/Properties/AssemblyInfo.cs | |||
| @@ -30,8 +30,8 @@ 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")] | 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")] |