Alex Smith 5196d5dad0 Merge branch 'master' into x86_64 ...

Conflicts:
	build/jam/HaikuImage
	src/add-ons/kernel/generic/Jamfile

2012-11-18 19:18:00 +00: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-11-18 19:18:00 +00:00

scripts

Merge branch 'master' into x86_64

2012-11-18 14:02:07 +00:00