Ingo Weinhold 19ae20e67e Merge branch 'master' into pm-flat ...

Conflicts:
	build/jam/HaikuImage
	build/jam/OptionalBuildFeatures
	build/jam/OptionalPackages
	build/jam/UserBuildConfig.sample
	data/bin/installoptionalpackage
	src/apps/deskbar/DeskbarMenu.cpp
	src/servers/debug/DebugServer.cpp
	src/system/kernel/fs/vfs.cpp

2011-11-05 17:00:01 +01:00

..

boot

Merge branch 'master' into pm-flat

2011-11-05 17:00:01 +01:00

data

Add US and international keyboard layout files for ThinkPad, ThinkPad T400s,

2011-11-02 04:51:30 +00:00