bitmask_client.git - [bitmask

Age	Commit message (Collapse)	Author
2013-01-31	actually merge the release/v0.2.0 branch!	kali
	My life has been a lie until this moment... I had done: git merge -s ours release/v0.2.0 to avoid deleting the debian folder... but that left the src untouched... Now I just rm'd the src folder and did a git checkout release/v0.2.0 src/ ... and merge happy! :)