Revision: 7214
          http://sourceforge.net/p/retroshare/code/7214
Author:   csoler
Date:     2014-03-29 14:18:05 +0000 (Sat, 29 Mar 2014)
Log Message:
-----------
merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global 
router stuff in trunk

Modified Paths:
--------------
    trunk/libretroshare/src/dbase/cachestrapper.cc
    trunk/libretroshare/src/dbase/fimonitor.cc
    trunk/libretroshare/src/grouter/grouterclientservice.h
    trunk/libretroshare/src/grouter/grouteritems.cc
    trunk/libretroshare/src/grouter/grouteritems.h
    trunk/libretroshare/src/grouter/groutermatrix.cc
    trunk/libretroshare/src/grouter/groutermatrix.h
    trunk/libretroshare/src/grouter/groutertypes.h
    trunk/libretroshare/src/grouter/p3grouter.cc
    trunk/libretroshare/src/grouter/p3grouter.h
    trunk/libretroshare/src/gxs/gxssecurity.cc
    trunk/libretroshare/src/gxs/gxssecurity.h
    trunk/libretroshare/src/gxs/rsgenexchange.cc
    trunk/libretroshare/src/libretroshare.pro
    trunk/libretroshare/src/retroshare/rsids.h
    trunk/libretroshare/src/retroshare/rsmsgs.h
    trunk/libretroshare/src/rsserver/p3msgs.cc
    trunk/libretroshare/src/rsserver/p3msgs.h
    trunk/libretroshare/src/rsserver/rsinit.cc
    trunk/libretroshare/src/serialiser/rsmsgitems.cc
    trunk/libretroshare/src/serialiser/rsmsgitems.h
    trunk/libretroshare/src/serialiser/rsserviceids.h
    trunk/libretroshare/src/serialiser/rstlvbase.h
    trunk/libretroshare/src/serialiser/rstlvtypes.h
    trunk/libretroshare/src/services/p3msgservice.cc
    trunk/libretroshare/src/services/p3msgservice.h
    trunk/libretroshare/src/util/rsdir.cc
    trunk/libretroshare/src/util/rsdir.h
    trunk/retroshare-gui/src/gui/MessagesDialog.cpp
    trunk/retroshare-gui/src/gui/NetworkDialog.cpp
    trunk/retroshare-gui/src/gui/NetworkDialog.h
    trunk/retroshare-gui/src/gui/RetroShareLink.cpp
    trunk/retroshare-gui/src/gui/RetroShareLink.h
    trunk/retroshare-gui/src/gui/common/FriendList.cpp
    trunk/retroshare-gui/src/gui/common/FriendSelectionDialog.cpp
    trunk/retroshare-gui/src/gui/common/FriendSelectionDialog.h
    trunk/retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
    trunk/retroshare-gui/src/gui/common/FriendSelectionWidget.h
    trunk/retroshare-gui/src/gui/common/PeerDefs.cpp
    trunk/retroshare-gui/src/gui/common/PeerDefs.h
    trunk/retroshare-gui/src/gui/feeds/ChatMsgItem.cpp
    trunk/retroshare-gui/src/gui/feeds/MsgItem.cpp
    trunk/retroshare-gui/src/gui/feeds/PeerItem.cpp
    trunk/retroshare-gui/src/gui/feeds/SecurityItem.cpp
    trunk/retroshare-gui/src/gui/msgs/MessageComposer.cpp
    trunk/retroshare-gui/src/gui/msgs/MessageComposer.h
    trunk/retroshare-gui/src/gui/msgs/MessageWidget.cpp
    trunk/retroshare-gui/src/gui/settings/ServerPage.cpp
    trunk/retroshare-gui/src/retroshare-gui.pro

Added Paths:
-----------
    trunk/libretroshare/src/retroshare/rsgrouter.h
    trunk/retroshare-gui/src/gui/settings/GlobalRouterStatistics.cpp
    trunk/retroshare-gui/src/gui/settings/GlobalRouterStatistics.h
    trunk/retroshare-gui/src/gui/settings/GlobalRouterStatistics.ui

Removed Paths:
-------------
    trunk/libretroshare/src/grouter/rsgrouter.h

Property Changed:
----------------
    trunk/
    trunk/libbitdht/
    trunk/libretroshare/
    trunk/plugins/
    trunk/retroshare-gui/src/

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Retroshare-devel mailing list
Retroshare-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/retroshare-devel

Reply via email to