Navigation

generic

Timestamp:

07/19/08 08:30:47 (6 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7921,7926-7928,7938-7941,7945-7947,7949-7950,7952,7955-7956,7961,7964-7968,7970-7978 via svnmerge from trunk.

This includes the newforms-admin branch, and thus is backwards-incompatible. The geographic admin is _not_ in this changeset, and is forthcoming.

Files:

django/branches/gis
- Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978
django/branches/gis/django/contrib/localflavor/generic/forms.py

r7354 r7979

1 from django import ~~newforms as~~ forms
1 from django import forms
2 2
3 3 DEFAULT_DATE_INPUT_FORMATS = (

r7354	r7979
1		from django import ~~newforms as~~ forms
	1	from django import forms
2	2
3	3	DEFAULT_DATE_INPUT_FORMATS = (