Mattias Ugelvik 45005cddf2 Merge branch 'master' of https://github.com/scopatz/xonsh ... Conflicts: xonsh/built_ins.py		2015-03-22 16:51:31 +01:00
..
_static	updating the webm with some slight pauses	2015-03-18 15:44:03 -04:00
api	documentation for dirstack module	2015-03-21 20:01:10 -04:00
previous	updated version date	2015-03-09 00:15:40 -05:00
conf.py	version bump to v0.1.2	2015-03-15 18:42:58 -05:00
faq.rst	added tutorial	2015-03-08 01:01:59 -06:00
index.rst	Adjusting the index for display of the demo as webm; with fallback to gif	2015-03-17 09:47:30 -04:00
Makefile	install instructions	2015-03-08 22:33:43 -05:00
todo.rst	added tutorial	2015-03-08 01:01:59 -06:00
tutorial.rst	Merge branch 'master' of https://github.com/scopatz/xonsh	2015-03-22 16:51:31 +01:00