i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pm-flat

Browse Source 
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
parent 7723ae9df2 dd58fc68f4
commit 19ae20e67e
1559 changed files with 98536 additions and 42861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/UserBuildConfig.sample
+5
View File
@@ -27,3 +27,8 @@
# Add the optional package WonderBrush to the image.
#AddOptionalHaikuImagePackages WonderBrush ;
# Add an example optional gfx driver and its accelerant.
# (Drivers just have a special rule because of the need for the symlink in dev/)
#AddDriversToHaikuImage graphics : optional_driver ;
#AddFilesToHaikuImage system add-ons accelerants : optional_driver.accelerant ;