Alex Smith 82694bd124 Merge branch 'master' into x86_64 ... Conflicts: headers/posix/arch/x86_64/arch_setjmp.h src/system/kernel/cache/block_cache.cpp		2012-07-20 18:33:46 +01:00
..
config_headers	Replaced mention of "SVN" with "version control system".	2011-12-04 14:51:47 +01:00
jam	Merge branch 'master' into x86_64	2012-07-20 18:33:46 +01:00
scripts	use system zlib when cross building gcc4 to fix #8242	2012-04-15 13:28:50 +02:00