Commit Graph

5 Commits

Author SHA1 Message Date
Benson Margulies 3968f3af17 Merge branch 'master' of github.com:kivy/pyjnius into python-34
Conflicts:
	.travis.yml
	Makefile
	setup.py
	tests/test_proxy.py
2015-11-03 07:51:45 -05:00
dessant 161ecce63f change travis notification target 2015-07-28 12:07:36 +03:00
dessant 0f4604d6fe Update .travis.yml 2015-06-24 22:41:22 +03:00
Benson Margulies e1070965cc Support Python 3.4
see if we can't make travis happy.
2015-05-03 11:24:27 -04:00
tshirtman 1a06bedd97 add travis file 2012-11-06 19:49:29 +01:00