Merge master

This commit is contained in:
Joshua
2014-05-11 12:48:17 -04:00

View File

@@ -29,7 +29,7 @@
<architecture name="armv7" if="android" /> <architecture name="armv7" if="android" />
<include haxelib="lime-tools" /> <include haxelib="lime-tools" unless="openfl" />
<haxelib name="lime-tools" if="setup" /> <haxelib name="lime-tools" if="setup" />
<haxelib name="nme" if="dev setup" /> <haxelib name="nme" if="dev setup" />