aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite
diff options
context:
space:
mode:
authorMelanie2013-10-06 18:32:20 +0100
committerMelanie2013-10-06 18:32:20 +0100
commit69054ad134f4418b344227b2b0cb42aa77bb3d78 (patch)
treee46a68f215aeff4122aad078cbaacaa59f49c9c2 /OpenSim/Data/SQLite
parentMerge branch 'master' into careminster (diff)
parent* Added a unique and interesting WebSocket grid login processor by hijacking ... (diff)
downloadopensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.zip
opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.gz
opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.bz2
opensim-SC-69054ad134f4418b344227b2b0cb42aa77bb3d78.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Data/SQLite')
-rw-r--r--OpenSim/Data/SQLite/Properties/AssemblyInfo.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
index 992982c..3873eaf 100644
--- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
61// You can specify all the values or you can default the Revision and Build Numbers 61// You can specify all the values or you can default the Revision and Build Numbers
62// by using the '*' as shown below: 62// by using the '*' as shown below:
63 63
64[assembly : AssemblyVersion("0.7.6.*")] 64[assembly : AssemblyVersion("0.8.0.*")]
65 65