# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1352936005 -3600
# Node ID 6b23f677b62139d4d0233c1157f8213f9fc5176a
# Parent  0e185eeea3e10967b64cea5618118665e8e91e79# Parent  6d5b46559bd9a12834d983edb09d0f99038c2855
Merge with 6d5b46559bd9a12834d983edb09d0f99038c2855

diff -r 6d5b46559bd9 -r 6b23f677b621 src/theend/__init__.py
--- a/src/theend/__init__.py	Tue Nov 13 22:18:07 2012 +0100
+++ b/src/theend/__init__.py	Thu Nov 15 00:33:25 2012 +0100
@@ -1,4 +1,4 @@
-VERSION = (1, 9, 0, "final", 0)
+VERSION = (1, 10, 0, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 6d5b46559bd9 -r 6b23f677b621 virtualenv/res/lib/lib_create_env.py
--- a/virtualenv/res/lib/lib_create_env.py	Tue Nov 13 22:18:07 2012 +0100
+++ b/virtualenv/res/lib/lib_create_env.py	Thu Nov 15 00:33:25 2012 +0100
@@ -49,7 +49,7 @@
     'PYYAML' : {'setup':'pyyaml', 'url':'http://pypi.python.org/packages/source/P/PyYAML/PyYAML-3.10.tar.gz', 'local': 'PyYAML-3.10.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'PYTHON-DIGEST' : {'setup':'python-digest', 'url':'http://pypi.python.org/packages/source/p/python-digest/python-digest-1.7.tar.gz', 'local': 'python-digest-1.7.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
     'DJANGO-TASTYPIE' : {'setup':'django-tastypie', 'url':'django-tastypie-0.9.11-modified.tar.gz', 'local': 'django-tastypie-0.9.11-modified.tar.gz', 'install' : {'method':'pip', 'option_str': None, 'dict_extra_env': None}},
-    'LDT': {'setup': 'ldt','url': 'ldt-1.29.tar.gz', 'local':"ldt-1.29.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
+    'LDT': {'setup': 'ldt','url': 'ldt-1.30.tar.gz', 'local':"ldt-1.30.tar.gz", 'install': {'method': 'pip', 'option_str': None, 'dict_extra_env': None}},
 }
 
 if system_str == 'Windows':
diff -r 6d5b46559bd9 -r 6b23f677b621 virtualenv/res/src/ldt-1.29.tar.gz
Binary file virtualenv/res/src/ldt-1.29.tar.gz has changed
diff -r 6d5b46559bd9 -r 6b23f677b621 virtualenv/res/src/ldt-1.30.tar.gz
Binary file virtualenv/res/src/ldt-1.30.tar.gz has changed