Public Git Hosting - mldonkey.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 2f0498b d1c203c 951b810 a55ba7b)

commit	634883966003ad390f33d90074ca9017f724555e
author	ygrek <ygrek@autistici.org>
	Sat, 29 May 2010 19:21:56 +0000 (29 22:21 +0300)
committer	ygrek <ygrek@autistici.org>
	Sat, 29 May 2010 19:21:56 +0000 (29 22:21 +0300)
tree	373ade42b1430791d12be45dcafcf28f6a454494	tree \| snapshot (tar.gz zip)
parent	2f0498b1f9900d507f552e2ecd049ef3b3cadb82	commit \| diff
parent	d1c203c853f160ac91df3f2657551603c633f279	commit \| diff
parent	951b810e48b460ea0177db45d1d92d916e450053	commit \| diff
parent	a55ba7b6e68adb2353d7d696a4012c9e227af6aa	commit \| diff

Merge branches 'upstream', 'dev/dc' and 'dev/bt_tracker'

mldonkey - cross-platform multi-network p2p daemon