aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Base/Properties/AssemblyInfo.cs
diff options
context:
space:
mode:
authorMelanie2013-04-28 19:03:39 +0200
committerMelanie2013-04-28 19:03:39 +0200
commit4275d7a839d7380ee50aeadc38a31dd467bd891e (patch)
tree1e589fc3b448b580d1cc25b52215ef5ce2d7ae78 /OpenSim/Server/Base/Properties/AssemblyInfo.cs
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentController module for dynamic floaters (WIP) (diff)
downloadopensim-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/Server/Base/Properties/AssemblyInfo.cs')
-rw-r--r--OpenSim/Server/Base/Properties/AssemblyInfo.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Base/Properties/AssemblyInfo.cs b/OpenSim/Server/Base/Properties/AssemblyInfo.cs
index 4bbe358..b4732b8 100644
--- a/OpenSim/Server/Base/Properties/AssemblyInfo.cs
+++ b/OpenSim/Server/Base/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