commit a74799264883ede23f2514624cd32d1b17211919 Merge: ecf4532 cfdacb2 Author: Tomás Touceda chiiph@torproject.org Date: Sat Jun 9 14:36:31 2012 -0300
Merge remote-tracking branch 'feroze/torrcprototype' into alpha
changes/TorrcPrototype | 3 + changes/external-prototype-macros | 3 + src/vidalia/CMakeLists.txt | 3 + src/vidalia/config/torrc/Torrc.cpp | 2 +- src/vidalia/config/torrc/Torrc.h | 4 +- src/vidalia/plugin/PluginEngine.cpp | 2 + src/vidalia/plugin/PluginEngine.h | 1 + .../plugin/prototypes/TorControlPrototype.cpp | 51 +-------------- src/vidalia/plugin/prototypes/TorrcPrototype.cpp | 71 ++++++++++++++++++++ src/vidalia/plugin/prototypes/TorrcPrototype.h | 63 +++++++++++++++++ src/vidalia/plugin/prototypes/prototypemacros.h | 49 ++++++++++++++ 11 files changed, 200 insertions(+), 52 deletions(-)