[Jython-checkins] jython (merge 2.2 -> 2.5): Merge 2.2.

[frank.wierzbicki]

http://hg.python.org/jython/rev/d84d0db24807
changeset:   6413:d84d0db24807
branch:      2.5
parent:      6410:b2ec53a0310f
parent:      6412:bed9f9de4ef3
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Mar 19 11:00:34 2012 -0700
summary:
  Merge 2.2.

files:
  .hgignore   |  3 +++
  .hgsub      |  1 -
  .hgsubstate |  1 -
  3 files changed, 3 insertions(+), 2 deletions(-)


diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -6,11 +6,14 @@
 *.orig
 *.rej
 *.swp
+\#*
 *~
 # IntelliJ files
 *.ipr
 *.iml
 *.iws
+.idea/misc.xml
+.idea/workspace.xml
 
 .AppleDouble
 .DS_Store
diff --git a/.hgsub b/.hgsub
--- a/.hgsub
+++ b/.hgsub
@@ -1,1 +0,0 @@
-CPythonLib = [svn] https://svn.python.org/projects/python/branches/release25-maint/Lib/
diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,1 +0,0 @@
-70085 CPythonLib

-- 
Repository URL: http://hg.python.org/jython