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, 28 insertions, 27 deletions

diff --git a/Lua/COPYRIGHT.txt b/Lua/COPYRIGHT.txt
index aea7fee0..cbc9105d 100644
--- a/Lua/COPYRIGHT.txt
+++ b/Lua/COPYRIGHT.txt
@@ -1,28 +1,29 @@
-Ultrastar Deluxe

-Copyright (C) 2007-2008 by the following:

-

-If you have contributed to this project then you deserve to be on this

-list.  Contact us (see: AUTHORS) and we'll add you.

-

-Jay Binks "jaybinks"

-Dirk Dunger "blindy"

-"eddie-0815"

-Mike Gränz "mog"

-Tobias Gunkel "tobigun"

-"mota"

-"s_alexander"

-Karl-Michael Schindler "mischi"

-Philipp Steinhardt "whiteshark"

-

-Based on UltraStar written by:

-"Corvus5"

-

-Patches contributed by:

-"d0ccrazy"

-"elBandito07"

-"f1fth_freed0m"

-"GogolNr1"

-"jekatt"

-Benedikt Krueger

-Holger Kuhn "hawkear"

+Ultrastar Deluxe
+Copyright (C) 2007-2008 by the following:
+
+If you have contributed to this project then you deserve to be on this
+list.  Contact us (see: AUTHORS) and we'll add you.
+
+Jay Binks "jaybinks"
+Dirk Dunger "blindy"
+"eddie-0815"
+Mike Gränz "mog"
+Tobias Gunkel "tobigun"
+"mota"
+Alexander S. "s_alexander"
+Karl-Michael Schindler "mischi"
+Philipp Steinhardt "whiteshark"
+
+Based on UltraStar written by:
+"Corvus5"
+
+Patches contributed by:
+"d0ccrazy"
+"elBandito07"
+"f1fth_freed0m"
+"GogolNr1"
+"jekatt"
+Benedikt Krueger
+Holger Kuhn "hawkear"
+Florian Küpper "flokuep"
 Wesley Stessens "profoX"
\ No newline at end of file