From: pimjager <pim@pimjager.nl>
Date: Mon, 29 Feb 2016 13:04:03 +0000 (+0100)
Subject: merged master
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=4c779c9791b03d96a76956e314cbc95f056448ce;p=cc1516.git

merged master
---

4c779c9791b03d96a76956e314cbc95f056448ce
diff --cc src/main.prj
index f2d50f9,db2b7d3..f0b6422
--- a/src/main.prj
+++ b/src/main.prj
@@@ -420,9 -419,9 +420,37 @@@ OtherModule
  			ReadableABC:	False
  			ReuseUniqueNodes:	True
  			Fusion:	False
++	Module
++		Name:	System.OS
++		Dir:	{Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64
++		Compiler
++			NeverMemoryProfile:	False
++			NeverTimeProfile:	False
++			StrictnessAnalysis:	True
++			ListTypes:	StrictExportTypes
++			ListAttributes:	True
++			Warnings:	True
++			Verbose:	True
++			ReadableABC:	False
++			ReuseUniqueNodes:	True
++			Fusion:	False
++	Module
++		Name:	System.OS
++		Dir:	{Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Linux-64
++		Compiler
++			NeverMemoryProfile:	False
++			NeverTimeProfile:	False
++			StrictnessAnalysis:	True
++			ListTypes:	StrictExportTypes
++			ListAttributes:	True
++			Warnings:	True
++			Verbose:	True
++			ReadableABC:	False
++			ReuseUniqueNodes:	True
++			Fusion:	False
  	Module
  		Name:	Control.Applicative
 -		Dir:	{Application}/lib/iTasks-SDK/Dependencies/Platform/OS-Independent
 +		Dir:	{Application}/lib/iTasks-SDK/Dependencies/clean-platform/src/libraries/OS-Independent
  		Compiler
  			NeverMemoryProfile:	False
  			NeverTimeProfile:	False