Merge tag '2.5.2'

Conflicts:
	lime/graphics/utils/ImageDataUtil.hx
This commit is contained in:
James Gray
2015-08-06 18:04:28 -05:00
85 changed files with 3175 additions and 1120 deletions

View File

@@ -1271,7 +1271,7 @@ class CommandLineTools {
}
if (project == null) {
if (project == null || (command != "rebuild" && project.sources.length == 0)) {
LogHelper.error ("You must have a \"project.xml\" file or specify another valid project file when using the '" + command + "' command");
return null;