Merge windows+cc branch into cairocanvas branch. Not finished, need to now merge windows branch to get changes from there

2014-01-10 16:07:57 -05:00
parent d15fda6d75 897fbdc652
commit 3020b224fa
466 changed files with 10821 additions and 1674 deletions
--- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h
+++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h
@@ -145,7 +145,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope
 	void prev_track (uint32_t initial_id);

  private:
-	ControlProtocol (const ControlProtocol&); /* noncopyable */
+	LIBCONTROLCP_LOCAL ControlProtocol (const ControlProtocol&); /* noncopyable */
        bool _active;
 };