6 Commits

Author	SHA1	Message	Date
Arvid Norberg	fce967b5fb	merged changes from RC_1_0 to change email address from @rasterbar.com to @libtorrent.org	2014-10-14 02:06:20 +00:00
Arvid Norberg	7351389ce8	land libtorrent_aio branch in trunk	2014-07-06 19:18:00 +00:00
Arvid Norberg	77a1090104	bump version	2012-11-18 04:32:22 +00:00
Arvid Norberg	33943f7184	merged set_version fix	2012-09-29 21:30:40 +00:00
Arvid Norberg	1db4fae595	merged patch from RC_0_16	2012-06-10 16:20:00 +00:00
Arvid Norberg	e5f980d80d	merged uTP branch into trunk (yay)	2010-11-29 01:33:05 +00:00