Django

Code

Show
Ignore:
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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978

  • django/branches/gis/django/contrib/localflavor/nl/forms.py

    r7768 r7979  
    55import re 
    66 
    7 from django.newforms import ValidationError 
    8 from django.newforms.fields import Field, Select, EMPTY_VALUES 
     7from django.forms import ValidationError 
     8from django.forms.fields import Field, Select, EMPTY_VALUES 
    99from django.utils.translation import ugettext_lazy as _ 
    1010from django.utils.encoding import smart_unicode