Django

Code

Show
Ignore:
Timestamp:
08/25/07 18:31:05 (1 year ago)
Author:
adrian
Message:

newforms-admin: Merged to [6013]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-5983 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6013
  • django/branches/newforms-admin/django/__init__.py

    r5475 r6014  
    55    v = '.'.join([str(i) for i in VERSION[:-1]]) 
    66    if VERSION[-1]: 
    7         v += '-' + VERSION[-1] 
     7        from django.utils.version import get_svn_revision 
     8        v = '%s-%s-%s' % (v, VERSION[-1], get_svn_revision()) 
    89    return v