merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 15 insertions, 15 deletions

diff --git a/Lua/dists/lazarus/readme.txt b/Lua/dists/lazarus/readme.txt
index c828266b..012ee37a 100755
--- a/Lua/dists/lazarus/readme.txt
+++ b/Lua/dists/lazarus/readme.txt
@@ -1,15 +1,15 @@
-Lazarus Project file

---------------------------------------

-

-Unix:

- 1. Copy "ultrastardx-unix.lpi" to <ultrastardx>/src 

-    (you may rename it to ultrastardx.lpi if you want)

- 2. Start Lazarus, click on "Project -> Open Project ..."  

-    and select "ultrastardx-unix.lpi"

-

-Windows:

- 1. Copy "ultrastardx-win.lpi" to <ultrastardx>/src 

-    (you may rename it to ultrastardx.lpi if you want)

- 2. Copy "clean.bat" to <ultrastardx>/src 

- 3. Start Lazarus, click on "Project -> Open Project ..."  

-    and select "ultrastardx-win.lpi"

+Lazarus Project file
+--------------------------------------
+
+Unix:
+ 1. Copy "ultrastardx-unix.lpi" to <ultrastardx>/src 
+    (you may rename it to ultrastardx.lpi if you want)
+ 2. Start Lazarus, click on "Project -> Open Project ..."  
+    and select "ultrastardx-unix.lpi"
+
+Windows:
+ 1. Copy "ultrastardx-win.lpi" to <ultrastardx>/src 
+    (you may rename it to ultrastardx.lpi if you want)
+ 2. Copy "clean.bat" to <ultrastardx>/src 
+ 3. Start Lazarus, click on "Project -> Open Project ..."  
+    and select "ultrastardx-win.lpi"