Django

Code

Show
Ignore:
Timestamp:
07/19/08 08:30:47 (6 months ago)
Author:
jbronn
Message:

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.

Files:

Legend:

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

    • Property svnmerge-integrated changed from /django/trunk:1-7917 to /django/trunk:1-7978
  • django/branches/gis/AUTHORS

    r7918 r7979  
    7575    Paul Bissex <http://e-scribe.com/> 
    7676    Simon Blanchard 
     77    David Blewett <david@dawninglight.net> 
    7778    Matt Boersma <ogghead@gmail.com> 
    7879    boobsd@gmail.com 
     
    173174    Thomas Güttler <hv@tbz-pariv.de> 
    174175    dAniel hAhler 
     176    hambaloney 
    175177    Brian Harring <ferringb@gmail.com> 
    176178    Brant Harris 
     
    195197    james_027@yahoo.com 
    196198    jcrasta@gmail.com 
     199    jdetaeye 
    197200    Zak Johnson <zakj@nox.cx> 
    198201    Nis Jørgensen <nis@superlativ.dk> 
     
    242245    limodou 
    243246    Philip Lindborg <philip.lindborg@gmail.com> 
     247    Simon Litchfield <simon@quo.com.au> 
    244248    Daniel Lindsley <polarcowz@gmail.com> 
    245249    Trey Long <trey@ktrl.com> 
     
    247251    Matt McClanahan <http://mmcc.cx/> 
    248252    Martin Maney <http://www.chipy.org/Martin_Maney> 
     253    Petr Marhoun <petr.marhoun@gmail.com> 
    249254    masonsimon+django@gmail.com 
    250255    Manuzhai 
     
    259264    Jason McBrayer <http://www.carcosa.net/jason/> 
    260265    mccutchen@gmail.com 
     266    Christian Metts 
    261267    michael.mcewan@gmail.com 
    262268    michal@plovarna.cz 
     
    271277    mrmachine <real.human@mrmachine.net> 
    272278    Robin Munn <http://www.geekforgod.com/> 
     279    msundstr 
    273280    Robert Myers <myer0052@gmail.com> 
    274281    Nebojša Dorđević 
     
    291298    pgross@thoughtworks.com 
    292299    phaedo <http://phaedo.cx/> 
     300    Julien Phalip <http://www.julienphalip.com> 
    293301    phil@produxion.net 
    294302    phil.h.smith@gmail.com 
     
    299307    Daniel Poelzleithner <http://poelzi.org/> 
    300308    polpak@yahoo.com 
     309    Matthias Pronk <django@masida.nl> 
    301310    Jyrki Pulliainen <jyrki.pulliainen@gmail.com> 
    302311    Johann Queuniet <johann.queuniet@adh.naellia.eu> 
     
    315324    Henrique Romano <onaiort@gmail.com> 
    316325    Armin Ronacher 
     326    Daniel Roseman <http://roseman.org.uk/>     
    317327    Brian Rosner <brosner@gmail.com> 
    318328    Oliver Rutherfurd <http://rutherfurd.net/>