RedHatTraining/pyramid.git

Chris McDonough

2011-12-14 a1995a197b735b2d1bbf674a5a6a82c359b5131f

refs
author	Chris McDonough <chrism@plope.com>
	Wednesday, December 14, 2011 09:41 +0100
committer	Chris McDonough <chrism@plope.com>
	Wednesday, December 14, 2011 09:41 +0100
commit	a1995a197b735b2d1bbf674a5a6a82c359b5131f
tree	e9b7f2f8ee0c892bbf6d35cd5d377a0193cd67ef tree \| zip \| gz
parent	ec507ade5541e1e3949fd6020062e78d113e0ed8 view \| diff 4375cf2bad3535ce896e95fcf1e388e33f2e8ecf view \| diff

Merge branch 'feature.viewdefaults'

9 files modified

	CHANGES.txt	20 ●●●●● diff \| view \| raw \| blame \| history
	docs/api/view.rst	3 ●●●●● diff \| view \| raw \| blame \| history
	docs/narr/viewconfig.rst	181 ●●●●● diff \| view \| raw \| blame \| history
	docs/whatsnew-1.3.rst	64 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/util.py	4 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/config/views.py	16 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_config/test_views.py	27 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/tests/test_view.py	34 ●●●●● diff \| view \| raw \| blame \| history
	pyramid/view.py	13 ●●●●● diff \| view \| raw \| blame \| history