merging distrib split into trunk

suppressed p3distrib in services 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2011-09-10 15:20:15 +00:00
parent dc0f4ef68a
commit 7e8d8aea9c
10 changed files with 867 additions and 1780 deletions

View file

@ -28,7 +28,7 @@
#include "retroshare/rschannels.h"
#include "retroshare/rsfiles.h"
#include "services/p3distrib.h"
#include "distrib/p3distrib.h"
#include "serialiser/rstlvtypes.h"
#include "serialiser/rschannelitems.h"