Merge branch 'no_setup_tools' of github.com:kyokley/xonsh into no_setup_tools

Browse source

Conflicts:
	setup.py

...

This commit is contained in:

Kevin Yokley 2016-05-31 22:56:41 -05:00

parent f06fb0a44f b77e91839b

commit da95b272db

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available