10 commits

Author	SHA1	Message	Date
Sam Gondelman	513c652ab3	merge from master and attempt to fix connexion conflicts	2015-08-05 12:42:39 -07:00
Sam Gondelman	95232920f1	trying to fix mac linking errors	2015-08-03 16:35:34 -07:00
Sam Gondelman	647bb2b9ce	removing unnecessary weak link	2015-08-01 11:41:29 -07:00
Sam Gondelman	8d77afaa94	more work on cleaning up connexion	2015-08-01 11:41:29 -07:00
Sam Gondelman	01c4e17236	trying to fix connexion linker errors, general style fixes, renamed some files	2015-08-01 11:41:29 -07:00
SamGondelman	e8daee013e	windows finds framework	2015-07-31 16:27:10 -07:00
SamGondelman	25e75bcc79	WIP: trying to fix windows not finding framework	2015-07-30 18:11:24 -07:00
Sam Gondelman	a01a4f929f	removing unnecessary weak link	2015-07-30 15:14:51 -07:00
Sam Gondelman	b8f7d4b8c8	more work on cleaning up connexion	2015-07-30 13:19:05 -07:00
Sam Gondelman	b19376ef6e	trying to fix connexion linker errors, general style fixes, renamed some files	2015-07-30 12:17:36 -07:00