drbob c0738eec7f Merging branches/v0.6-initdev into trunk. ... These split at 6672 -> 7075, so quite a bit merge. libretroshare compiles - but untested. retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors). some plugins will be broken. retroshare-nogui is untested. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc		2014-02-01 14:16:15 +00:00
..
menu	Make rs-nogui+SSH compile against the trunk.	2012-12-17 01:24:16 +00:00
resources	Fixed compile on Windows with enabled shadow build of Qt Creator.	2012-02-17 11:14:06 +00:00
rpc	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00
ssh	Updated the notification system. Main changes are:	2014-01-07 22:51:22 +00:00
introserver.cc	fixed compilation of introserver.cc	2014-01-20 20:06:55 +00:00
introserver.h	patch from costa to add a spanish intro server	2012-03-17 15:34:03 +00:00
mingw32make.bat	update version and changelog	2012-09-26 12:26:27 +00:00
notifytxt.cc	Tweaks to nogui to remove rsiface references.	2013-08-21 21:51:36 +00:00
notifytxt.h	Updated the notification system. Main changes are:	2014-01-07 22:51:22 +00:00
protobuf.pri	added qt file to handle protobuf targets	2012-10-04 19:11:21 +00:00
retroshare-nogui.pro	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00
retroshare.cc	Merging branches/v0.6-initdev into trunk.	2014-02-01 14:16:15 +00:00
rpcsystem.h	Added Multiple Channels and Event support to RPC system.	2012-09-01 19:35:23 +00:00