delta/python-packages/networkx.git/setup.py, branch docdraftgithub.com: networkx/networkx.git
Merge branch 'master' into greedy_color2014-06-07T18:56:38+00:00ysituysitu@users.noreply.github.com2014-06-07T18:56:38+00:00f4f3129d56c25a1a79437f8a9cea1f6b472e810a
Merge branch 'greedy-coloring' of git://github.com/itu-sass-s2014/networkx into greedy_color2014-06-07T12:01:50+00:00ysituysitu@users.noreply.github.com2014-06-07T12:01:50+00:00aa02955691df0fb6512b0214df0cdfc07ec89734
Conflicts:
networkx/algorithms/__init__.py
Conflicts:
networkx/algorithms/__init__.py
Add detection of Python 2.7+ upon install and import2014-06-06T18:48:30+00:00ysituysitu@users.noreply.github.com2014-06-06T18:48:30+00:0038e03974a262cce28b45a9b612d2b175d84106f8
Merge branch 'master' into setup2014-06-03T20:41:27+00:00ysituysitu@users.noreply.github.com2014-06-03T20:41:27+00:00011d2e3facfc18bccc09f05f9647c93fc0fb2732
Conflicts:
setup.py
Conflicts:
setup.py
Force use of setuptools2014-06-03T18:13:35+00:00ysituysitu@users.noreply.github.com2014-06-03T18:13:35+00:0086c3606f8abb883107d2afcf66ff670fcf94a213
Fix merge conflict in setup.py2014-04-15T13:31:19+00:00Jan Aagaard Meierjanzeh@gmail.com2014-04-15T13:31:19+00:0044bd9f6177671361ece91383e64d9e8b73658e7d
Include .bz2 files in networkx.algorithm.flow2014-03-24T15:15:18+00:00ysituysitu@users.noreply.github.com2014-03-24T15:15:18+00:0089ec45fefc1b166685305fba8b4fe08d5588dc83
first go at implementing the greedy coloring first fit algorithm with maximum degree ordering2014-02-18T13:31:13+00:00Henrik Haugbøllehenrikhaugboelle@gmail.com2014-02-18T13:31:13+00:009ad73bfc31d0831efb493699763f2ec738f34d02