Merge remote-tracking branch 'refs/remotes/origin/master' into gui

2016-11-30 13:08:08 +01:00
parent 3d79db4c52 6ebbf882f3
commit e6e4a437bd
227 changed files with 9347 additions and 4815 deletions
--- a/build/scripts/actions/generateheaders.lua
+++ b/build/scripts/actions/generateheaders.lua
@@ -76,7 +76,7 @@ ACTION.Function = function ()
 			error("Failed to create header file (" .. v.Target .. "): " .. err)
 		end

-		header:write("// This file was automatically generated on " .. os.date("%d %b %Y at %X") .. "\n\n")
+		header:write("// This file was automatically generated\n\n")
 		if (v.Header) then
 			header:write(v.Header)
 		end