Django

Code

Show
Ignore:
Timestamp:
08/05/08 12:15:33 (5 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

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

  • django/branches/gis/django/contrib/admin/widgets.py

    r7979 r8215  
    88from django.forms.widgets import RadioFieldRenderer 
    99from django.forms.util import flatatt 
    10 from django.utils.datastructures import MultiValueDict 
    11 from django.utils.text import capfirst, truncate_words 
     10from django.utils.text import truncate_words 
    1211from django.utils.translation import ugettext as _ 
    1312from django.utils.safestring import mark_safe