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/ApplicationPlugins/LoadRegions/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 '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs index 57615ea..1b6a3e1 100644 --- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs +++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs | |||
| @@ -60,7 +60,6 @@ using System.Runtime.InteropServices; | |||
| 60 | // | 60 | // |
| 61 | // You can specify all the values or you can default the Build and Revision Numbers | 61 | // You can specify all the values or you can default the Build and Revision Numbers |
| 62 | // by using the '*' as shown below: | 62 | // by using the '*' as shown below: |
| 63 | // [assembly: AssemblyVersion("0.7.5.*")] | 63 | // [assembly: AssemblyVersion("0.7.6.*")] |
| 64 | 64 | ||
| 65 | [assembly : AssemblyVersion("0.7.5.*")] | 65 | [assembly : AssemblyVersion("0.7.6.*")] |
| 66 | [assembly : AssemblyFileVersion("0.6.5.0")] \ No newline at end of file | ||