Django

Code

Show
Ignore:
Timestamp:
06/26/08 10:11:55 (7 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7643-7662,7667-7668,7672-7682,7686-7693,7695-7698,7700-7702,7704-7706,7710,7712-7729,7731-7732,7738-7758,7760-7766 via svnmerge from trunk.

Files:

Legend:

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

    • Property svnmerge-integrated changed from /django/trunk:1-7641 to /django/trunk:1-7767
  • django/branches/gis/setup.py

    r7176 r7768  
    5252    version = version, 
    5353    url = 'http://www.djangoproject.com/', 
    54     author = 'Lawrence Journal-World', 
    55     author_email = 'holovaty@gmail.com', 
     54    author = 'Django Software Foundation', 
     55    author_email = 'foundation@djangoproject.com', 
    5656    description = 'A high-level Python Web framework that encourages rapid development and clean, pragmatic design.', 
    5757    packages = packages,