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
-18
View File
@@ -14,13 +14,6 @@ class BString;
struct entry_ref;
//! Reference structure to a particular vnode on a particular device
/*! <b>node_ref</b> - A node reference.
@author <a href="mailto:[email protected]">Tyler Dauwalder</a>
@author Be Inc.
@version 0.0.0
*/
struct node_ref {
node_ref();
node_ref(const node_ref &ref);
@@ -34,17 +27,6 @@ struct node_ref {
};
//! A BNode represents a chunk of data in the filesystem.
/*! The BNode class provides an interface for manipulating the data and attributes
belonging to filesystem entries. The BNode is unaware of the name that refers
to it in the filesystem (i.e. its entry); a BNode is solely concerned with
the entry's data and attributes.
@author <a href='mailto:[email protected]'>Tyler Dauwalder</a>
@version 0.0.0
*/
class BNode : public BStatable {
public:
BNode();