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
..
build	Style fixes suggested by Axeld.	2012-03-09 14:39:24 -05:00
compatibility	* Added definitions for n_short, n_long, and n_time as expected on FreeBSD when	2011-07-23 15:41:47 +00:00
config	Changed {,u}int64 to be long rather than long long on x86_64.	2012-06-28 12:36:45 +01:00
cpp	Fix #7948: add correct prototype for String::compare alongside the wrong one	2011-10-31 09:56:00 +00:00
glibc	* merged 32bit-wchar_t branches of buildtools and haiku back into	2009-07-07 10:30:09 +00:00
libs	Remove lp_solve headers.	2012-05-08 07:28:16 +12:00
os	Merge branch 'master' into x86_64	2012-07-20 18:33:46 +01:00
posix	Merge branch 'master' into x86_64	2012-07-20 18:33:46 +01:00
private	Merge branch 'master' into x86_64	2012-07-20 18:33:46 +01:00
tools	* Moved everything into the SymbolPatcher namespace.	2009-11-05 17:16:17 +00:00