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/Data | |
| 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/Data')
| -rw-r--r-- | OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/MySQL/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/Null/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/Properties/AssemblyInfo.cs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs index 4e96be8..9bc580e 100644 --- a/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MSSQL/Properties/AssemblyInfo.cs | |||
| @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; | |||
| 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.7.6.*")] |
| 65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | |
diff --git a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs index 7bfa28d..1146d92 100644 --- a/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/MySQL/Properties/AssemblyInfo.cs | |||
| @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; | |||
| 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.7.6.*")] |
| 65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | |
diff --git a/OpenSim/Data/Null/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs index 3931b3d..1e02c31 100644 --- a/OpenSim/Data/Null/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/Null/Properties/AssemblyInfo.cs | |||
| @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; | |||
| 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.7.6.*")] |
| 65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | |
diff --git a/OpenSim/Data/Properties/AssemblyInfo.cs b/OpenSim/Data/Properties/AssemblyInfo.cs index 9f342ad..a85f473 100644 --- a/OpenSim/Data/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/Properties/AssemblyInfo.cs | |||
| @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; | |||
| 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.7.6.*")] |
| 65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | |
diff --git a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs index ba52f82..992982c 100644 --- a/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs +++ b/OpenSim/Data/SQLite/Properties/AssemblyInfo.cs | |||
| @@ -62,4 +62,4 @@ using System.Runtime.InteropServices; | |||
| 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.7.6.*")] |
| 65 | [assembly : AssemblyFileVersion("0.6.5.0")] | 65 | |