aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSimDefaults.ini
diff options
context:
space:
mode:
authorMelanie2013-02-04 19:21:39 +0000
committerMelanie2013-02-04 19:21:39 +0000
commit7482ad1c22e44e03c1a36f1d67d862084c20dae6 (patch)
tree9450dd7cbe79e1d34b6d0519d994b1fd16a253ed /bin/OpenSimDefaults.ini
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.zip
opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.gz
opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.bz2
opensim-SC-7482ad1c22e44e03c1a36f1d67d862084c20dae6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'bin/OpenSimDefaults.ini')
-rw-r--r--bin/OpenSimDefaults.ini1
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index fa88146..2edc1f8 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,7 +1,6 @@
1; This file contains defaults for various settings in OpenSimulator. These can be overriden 1; This file contains defaults for various settings in OpenSimulator. These can be overriden
2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini). 2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
3 3
4
5[Startup] 4[Startup]
6 ; Console prompt 5 ; Console prompt
7 ; Certain special characters can be used to customize the prompt 6 ; Certain special characters can be used to customize the prompt