summaryrefslogtreecommitdiff
path: root/src/leap/util/coroutines.py
AgeCommit message (Collapse)Author
2013-01-31actually 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! :)
2012-08-08Merge branch 'dict-comprenhension-fix' into developkali
fix for 2.6 compatibility, we should try not to use syntax backported from 3.x into 2.7 :|
2012-08-01fileutil.which implementationkali