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

diff --git a/Lua/src/base/UGraphicClasses.pas b/Lua/src/base/UGraphicClasses.pas
index 3fbe262f..cdaa238e 100644
--- a/Lua/src/base/UGraphicClasses.pas
+++ b/Lua/src/base/UGraphicClasses.pas
@@ -124,16 +124,16 @@ var
 implementation
 
 uses
-  sysutils,
+  SysUtils,
+  Math,
   gl,
+  UCommon,
+  UDrawTexture,
+  UGraphic,
   UIni,
-  UMain,
-  UThemes,
+  UNote,
   USkins,
-  UGraphic,
-  UDrawTexture,
-  UCommon,
-  math;
+  UThemes;
 
 //TParticle
 constructor TParticle.Create(cX, cY         : real;