Jason Perkins 8048890507 Merge branch 'master' of https://github.com/amc522/premake-core into amc522-master ... # Conflicts: # src/actions/vstudio/vs2010_vcxproj_user.lua		2015-05-17 12:01:04 -04:00
..
cs2005	Finish renaming architectures away from x32/x64	2015-04-13 18:27:11 -04:00
sln2005	Fix usages of old external function casing	2015-05-07 15:37:32 -04:00
vc200x	Finish renaming architectures away from x32/x64	2015-04-13 18:27:11 -04:00
vc2010	Merge branch 'master' of https://github.com/amc522/premake-core into amc522-master	2015-05-17 12:01:04 -04:00