3 Commits

Author	SHA1	Message	Date
Jordan Hall	9d3a0a160f	Merging with master and resolving conflicts	2013-08-11 00:08:48 +01:00
David Nichols	97f0c56aa8	Adding configuration option to listen for connections when operating with a SOCKS proxy.	2013-07-12 13:03:09 -05:00
Jonathan Warren	aeeb7c9878	Moved UI related files all into the bitmessageqt folder	2013-06-18 13:59:51 -04:00