Ronny Pfannschmidt 68f658b6cc Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master		2016-05-13 17:52:59 +02:00
..
assertion	Moved py.code code over to py.test	2016-01-25 23:18:04 -02:00
costlysetup	rename pytest.factory usages into pytest.fixture ones	2012-10-05 10:21:35 +02:00
layout1	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
nonpython	fix issue307 - use yaml.safe_load instead of yaml.load, thanks Mark Eichin.	2013-05-16 09:59:48 +02:00
py2py3	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
attic.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
conftest.py	added "docs/en" directory and moved	2012-06-06 08:52:53 +09:00
index.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
markers.rst	Regendocs	2016-03-17 17:13:41 -04:00
multipython.py	Moved py.code code over to py.test	2016-01-25 23:18:04 -02:00
nonpython.rst	Regendocs	2016-03-17 17:13:41 -04:00
parametrize.rst	Regendocs	2016-03-17 17:13:41 -04:00
pythoncollection.py	add changelog entry for anthon's hynek-fication of options,	2013-08-01 17:32:19 +02:00
pythoncollection.rst	Fix minor mistake in test discovery doc	2016-03-20 13:24:43 +01:00
reportingdemo.rst	Regendocs	2016-03-17 17:13:41 -04:00
simple.rst	Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master	2016-05-13 17:52:59 +02:00
special.rst	Updated documentation from txt to rst	2015-08-04 16:41:02 +05:30
xfail_demo.py	finalize pytest-2.6.1 release, regen docs	2014-08-07 21:41:51 +02:00