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
This commit is contained in:
Ingo Weinhold
2011-11-05 17:00:01 +01:00
1559 changed files with 98536 additions and 42861 deletions
+5
View File
@@ -164,6 +164,11 @@ if [ "$SAFEMODE" != "yes" ]; then
launch $SERVERS/notification_server ""
fi
# Launch Power Daemon
if [ "$SAFEMODE" != "yes" ]; then
launch $SERVERS/power_daemon ""
fi
# Check for daylight saving time
launch system/bin/dstcheck