Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
49,643 Commits 9 Branches 0 Tags 473 MiB
15a4535714
Commit Graph

2 Commits

Author SHA1 Message Date
Ingo Weinhold
7e78b434f4 Merge remote-tracking branch 'haiku/master' into package-management 
Conflicts:
	build/jam/HaikuImage
	build/jam/OptionalPackageDependencies
	build/jam/OptionalPackages
	build/scripts/build_cross_tools_gcc4
	src/add-ons/translators/icns/Jamfile
	src/add-ons/translators/jpeg/Jamfile
 2013-07-08 14:01:00 +02:00
Ingo Weinhold
e8c5236a9c Move image definition jamfiles to build/jam/images 2013-07-07 10:44:43 +02:00