Navigation

databrowse

Timestamp:

08/05/08 12:15:33 (4 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:

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

r7979	r8215
5	5	from django.shortcuts import render_to_response
6	6	from django.utils.text import capfirst
7		~~from django.utils.translation import get_date_formats~~
8	7	from django.utils.encoding import force_unicode
9	8	from django.utils.safestring import mark_safe

r7176	r8215
7	7	from django.utils.encoding import smart_str, force_unicode
8	8	from django.utils.safestring import mark_safe
9		~~from django.views.generic import date_based~~
10	9	import urllib
11	10

r6672	r8215
1	1	from django import http
2	2	from django.db import models
3		from django.contrib.databrowse.datastructures import EasyModel~~, EasyChoice~~
	3	from django.contrib.databrowse.datastructures import EasyModel
4	4	from django.shortcuts import render_to_response
5	5	from django.utils.safestring import mark_safe

r7176	r8215
1		~~from django.db.models import FieldDoesNotExist, DateTimeField~~
2	1	from django.http import Http404
3	2	from django.shortcuts import render_to_response
4		~~from django.contrib.databrowse.datastructures import EasyModel, EasyChoice~~
5	3
6	4	###########