branch merge

2010-02-01 13:10:31 -08:00
parent e4fb8ffd23 f7855387cf
commit 0c932bc297
23 changed files with 1003 additions and 345 deletions
--- a/src/node/packetbb.h
+++ b/src/node/packetbb.h
@@ -631,7 +631,6 @@ public:
  bool operator!= (const PbbPacket &other) const;

 protected:
-  void SerializePacketTlv (Buffer::Iterator &start) const;

 private:
  PbbTlvBlock m_tlvList;