Merge branch 'develop' of https://github.com/graemeg/fpGUI into develop

Fixed xml conflicts of lpi's manually
Conflicts:
	examples/gui/filedialog/filedialog.lpi
	examples/gui/modalforms/modalforms.lpi

2 files changed, 8 insertions, 3 deletions

diff --git a/examples/gui/customstyles/customstyles.lpi b/examples/gui/customstyles/customstyles.lpi
index 50b2d740..36fef016 100644
--- a/examples/gui/customstyles/customstyles.lpi
+++ b/examples/gui/customstyles/customstyles.lpi
@@ -53,6 +53,12 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
+    <Target>
+      <Filename Value="customstyles_test"/>
+    </Target>
+    <SearchPaths>
+      <UnitOutputDirectory Value="units"/>
+    </SearchPaths>
     <Parsing>
       <SyntaxOptions>
         <CStyleOperator Value="False"/>
@@ -73,7 +79,6 @@
       <CompilerMessages>
         <UseMsgFile Value="True"/>
       </CompilerMessages>
-      <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
diff --git a/examples/gui/customstyles/mystyle.pas b/examples/gui/customstyles/mystyle.pas
index 665a22b0..8ca00d33 100644
--- a/examples/gui/customstyles/mystyle.pas
+++ b/examples/gui/customstyles/mystyle.pas
@@ -1,4 +1,4 @@
-{
+(*
   A very quick and basic style implementation. It took all of 10 minutes.
   To apply this style, follow these instructions:
 
@@ -31,7 +31,7 @@
       end;
     end;
 
-}
+*)
 unit mystyle;
 
 {$mode objfpc}{$H+}