Julian Arni bc25defd10 Merge branch 'master' into feature/jkarni/jsinput ...

Conflicts:
	doc/public/index.rst

2013-06-24 10:46:19 -04:00

..

capa

Merge branch 'master' into feature/jkarni/jsinput

2013-06-24 10:46:19 -04:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

setup.py

Pin capa to require distribute greater than 28 because an old branch had it at 30

2013-05-31 11:24:49 -04:00