Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

Conflicts:
	bin/Regions/Regions.ini.example

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/README b/doc/README
new file mode 100644
index 0000000..9c95557
--- /dev/null
+++ b/doc/README
@@ -0,0 +1,20 @@
+README
+
+This directory does not currently contain any OpenSimulator user level documentation.  Such
+documentation can be found at
+
+http://opensimulator.org
+
+instead.
+
+Rather, this directory can contain source-code documentation as generated via the doxygen package.
+
+To do this, either execute
+
+doxygen doxygen.conf 
+
+on the command line or run the target
+
+nant doxygen
+
+if you have nant installed.