Django

Code

Show
Ignore:
Timestamp:
02/28/08 15:24:51 (10 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7105-7168 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7102 to /django/trunk:1-7175
  • django/branches/gis/django/test/_doctest.py

    r6920 r7176  
    101101import __future__ 
    102102 
    103 import sys, traceback, inspect, linecache, os, re, types 
     103import sys, traceback, inspect, linecache, os, re 
    104104import unittest, difflib, pdb, tempfile 
    105105import warnings