Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

viewer-2-initial-appearance
Melanie 2010-10-05 02:12:35 +01:00
commit ba0a19c228
15 changed files with 66 additions and 67 deletions

View File

@ -88,7 +88,6 @@
WelcomeMessage = "Welcome, Avatar!" WelcomeMessage = "Welcome, Avatar!"
;; This should always be the very last thing on this file ;; This should always be the very last thing on this file
[Includes] [Includes]
Include-Common = "config-include/StandaloneCommon.ini" Include-Common = "config-include/StandaloneCommon.ini"