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/Tools/Configger/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/Tools/Configger/Properties')
| -rw-r--r-- | OpenSim/Tools/Configger/Properties/AssemblyInfo.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs index 62a2f2d..0348628 100644 --- a/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs +++ b/OpenSim/Tools/Configger/Properties/AssemblyInfo.cs | |||
| @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; | |||
| 29 | // Build Number | 29 | // Build Number |
| 30 | // Revision | 30 | // Revision |
| 31 | // | 31 | // |
| 32 | [assembly: AssemblyVersion("0.7.5.*")] | 32 | [assembly: AssemblyVersion("0.7.6.*")] |
| 33 | [assembly: AssemblyFileVersion("1.0.0.0")] | 33 | |