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

..

artwork

Some more perspective tweaking again, hopefully it's ok now. stippi ?

2011-10-29 08:12:54 +00:00

bin

Merge branch 'master' into pm-flat

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

boot_cd

Applied patch by Karvjorm to make the HTML xhtml strict compliant. Fixes #6197. Thanks!

2010-07-04 05:32:10 +00:00

catalogs

Updated Finnish catkeys. Thanks.

2011-11-02 13:21:53 +00:00

common

"app" option to notify is renamed to "group" in new Haiku versions.

2011-11-03 09:40:51 +00:00

config/boot

…

develop

* Propose using $(STDCPPLIBS) definition for version-independent linking

2011-10-26 20:12:09 +00:00

etc

Remove unneeded LC_ environment variables which are glibc extensions not

2011-07-09 17:25:22 +00:00

image_directories

Reverted r35043. The "Save as PDF" printer could not save to

2010-03-14 15:40:18 +00:00

settings

I was being lazy, as pointe out by mmlr. It is much better to copy DSDT always do you don't need to figure out if you need to toggle that switch.

2011-10-21 19:42:46 +00:00

system

Merge branch 'master' into pm-flat

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