Jython

Revision: 5205
          http://jython.svn.sourceforge.net/jython/?rev=5205&view=rev
Author:   fwierzbicki
Date:     2008-08-19 15:07:48 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/utf16

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/asm:1-4384 /branches/utf16:1-4726
   + /branches/asm:1-4384


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5207
          http://jython.svn.sourceforge.net/jython/?rev=5207&view=rev
Author:   fwierzbicki
Date:     2008-08-19 21:14:10 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
remove asm branch tracking

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Deleted: svnmerge-integrated
   - /branches/asm:1-5205


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5263
          http://jython.svn.sourceforge.net/jython/?rev=5263&view=rev
Author:   fwierzbicki
Date:     2008-08-29 12:14:12 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-5209" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/nowalker

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Added: svnmerge-integrated
   + /branches/nowalker:1-5209


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5616
          http://jython.svn.sourceforge.net/jython/?rev=5616&view=rev
Author:   fwierzbicki
Date:     2008-11-23 15:02:10 +0000 (Sun, 23 Nov 2008)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/nowalker

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Deleted: svnmerge-integrated
   - /branches/nowalker:1-5263


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5691
          http://jython.svn.sourceforge.net/jython/?rev=5691&view=rev
Author:   fwierzbicki
Date:     2008-12-04 02:20:28 +0000 (Thu, 04 Dec 2008)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-5585" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/astwrite

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Added: svnmerge-integrated
   + /branches/astwrite:1-5585


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5738
          http://jython.svn.sourceforge.net/jython/?rev=5738&view=rev
Author:   cgroves
Date:     2008-12-12 03:31:52 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-5563" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/newstyle-java-types

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/astwrite:1-5692
   + /branches/astwrite:1-5692 /branches/newstyle-java-types:1-5563


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5741
          http://jython.svn.sourceforge.net/jython/?rev=5741&view=rev
Author:   cgroves
Date:     2008-12-12 05:15:56 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/newstyle-java-types

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/astwrite:1-5692 /branches/newstyle-java-types:1-5738
   + /branches/astwrite:1-5692


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5748
          http://jython.svn.sourceforge.net/jython/?rev=5748&view=rev
Author:   fwierzbicki
Date:     2008-12-12 15:15:38 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/astwrite

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Deleted: svnmerge-integrated
   - /branches/astwrite:1-5692


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5904
          http://jython.svn.sourceforge.net/jython/?rev=5904&view=rev
Author:   fwierzbicki
Date:     2009-01-09 20:43:55 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
locked CPython to revision 68460.

Revision Links:
--------------
    http://jython.svn.sourceforge.net/jython/?rev=68460&view=rev

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svn:externals
   - CPythonLib http://svn.python.org/projects/python/branches/release25-maint/Lib/

   + CPythonLib -r68460 http://svn.python.org/projects/python/branches/release25-maint/Lib/



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6045
          http://jython.svn.sourceforge.net/jython/?rev=6045&view=rev
Author:   zyasoft
Date:     2009-02-24 05:04:05 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-5948" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/pbcvm

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Added: svnmerge-integrated
   + /branches/pbcvm:1-5948


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6050
          http://jython.svn.sourceforge.net/jython/?rev=6050&view=rev
Author:   fwierzbicki
Date:     2009-03-02 00:59:05 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Bump CPython version to 70085.

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svn:externals
   - CPythonLib -r68460 http://svn.python.org/projects/python/branches/release25-maint/Lib/

   + CPythonLib -r70085 http://svn.python.org/projects/python/branches/release25-maint/Lib/



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6074
          http://jython.svn.sourceforge.net/jython/?rev=6074&view=rev
Author:   fwierzbicki
Date:     2009-03-06 17:58:41 +0000 (Fri, 06 Mar 2009)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-5750" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/modjy

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/pbcvm:1-6045
   + /branches/modjy:1-5750 /branches/pbcvm:1-6045


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6243
          http://jython.svn.sourceforge.net/jython/?rev=6243&view=rev
Author:   zyasoft
Date:     2009-04-18 23:32:59 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
Initialized merge tracking via "svnmerge" with revisions "1-6160" from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/newlist

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/modjy:1-6074 /branches/pbcvm:1-6045
   + /branches/modjy:1-6074 /branches/pbcvm:1-6045 /branches/newlist:1-6160


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6300
          http://jython.svn.sourceforge.net/jython/?rev=6300&view=rev
Author:   otmarhumbel
Date:     2009-05-05 21:12:43 +0000 (Tue, 05 May 2009)

Log Message:
-----------
add profile.txt to svn:ignore

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svn:ignore
   - .externalToolBuilders
.classpath
.project
*.ipr
*.iws
*.iml
build
dist
ant.properties
bin
cachedir
.settings

   + .externalToolBuilders
.classpath
.project
*.ipr
*.iws
*.iml
build
dist
ant.properties
bin
cachedir
.settings
profile.txt



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6309
          http://jython.svn.sourceforge.net/jython/?rev=6309&view=rev
Author:   pjenvey
Date:     2009-05-07 00:58:27 +0000 (Thu, 07 May 2009)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/modjy

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/modjy:1-6074 /branches/pbcvm:1-6045 /branches/newlist:1-6243
   + /branches/newlist:1-6243 /branches/pbcvm:1-6045


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6310
          http://jython.svn.sourceforge.net/jython/?rev=6310&view=rev
Author:   pjenvey
Date:     2009-05-07 00:58:52 +0000 (Thu, 07 May 2009)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/newlist

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/newlist:1-6243 /branches/pbcvm:1-6045
   + /branches/pbcvm:1-6045


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6566
          http://jython.svn.sourceforge.net/jython/?rev=6566&view=rev
Author:   nriley
Date:     2009-07-23 03:26:56 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
svnmerge property for JSR 223 branch

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/pbcvm:1-6045
   + /branches/jsr223:1-6284 /branches/pbcvm:1-6045


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6568
          http://jython.svn.sourceforge.net/jython/?rev=6568&view=rev
Author:   nriley
Date:     2009-07-23 05:15:49 +0000 (Thu, 23 Jul 2009)

Log Message:
-----------
Removed merge tracking for "svnmerge" for 
https://jython.svn.sourceforge.net/svnroot/jython/branches/jsr223

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/jsr223:1-6566 /branches/pbcvm:1-6045
   + /branches/pbcvm:1-6045


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7173
          http://jython.svn.sourceforge.net/jython/?rev=7173&view=rev
Author:   fwierzbicki
Date:     2010-11-23 06:51:27 +0000 (Tue, 23 Nov 2010)

Log Message:
-----------
Use https in case of firewall blockage.

Property Changed:
----------------
    trunk/jython/


Property changes on: trunk/jython
___________________________________________________________________
Modified: svn:externals
   - CPythonLib -r70085 http://svn.python.org/projects/python/branches/release25-maint/Lib/

   + CPythonLib -r70085 https://svn.python.org/projects/python/branches/release25-maint/Lib/



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.