| #
19ae20e6 |
| 05-Nov-2011 |
Ingo Weinhold <ingo_weinhold@gmx.de> |
Merge branch 'master' into pm-flat
Conflicts:
build/jam/HaikuImage
build/jam/OptionalBuildFeatures
build/jam/OptionalPackages
build/jam/UserBuildConfig.sample
data/bin/installoptionalpackage
s
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
show more ...
|
| #
a820304d |
| 14-Aug-2011 |
Matt Madia <mattmadia@gmail.com> |
Adjusted the copyright header, to account for Be Sample Code License and
copyrights. Automatic whitespace cleanup. No functional change.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42635 a9
Adjusted the copyright header, to account for Be Sample Code License and
copyrights. Automatic whitespace cleanup. No functional change.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@42635 a95241bf-73f2-0310-859d-f6bbb57e9c96
show more ...
|