Justin Bronn
aa239e3e54
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.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-05 17:15:33 +00:00
Justin Bronn
149e731c3c
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.
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19 13:30:47 +00:00
Justin Bronn
2efc34dc5e
gis: Merged revisions 7280-7353 via svnmerge from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@7354 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-03-23 17:18:58 +00:00
Justin Bronn
7e322b5908
gis: Merged revisions 6920-6989 via svnmerge from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-01-02 16:57:53 +00:00
Justin Bronn
34560a01da
gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,6753,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend base.py due to ikelly's patch in r6905.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-15 01:38:43 +00:00
Jeremy Dunck
23384af79b
gis: Merged 6672-6783 vis svnmerge from trunk
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6815 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-01 22:12:44 +00:00
Justin Bronn
f66821deae
gis: Merged revisions 6614-6671 via svnmerge from trunk.
...
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@6672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-11-14 19:13:37 +00:00
