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

…

compatibility

…

config

Changed {,u}int64 to be long rather than long long on x86_64.

2012-06-28 12:36:45 +01:00

cpp

…

glibc

…

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

…