changeset 1555:4aeba581990b

Merge with mercurial/crew
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 17 Nov 2005 19:18:33 +0100
parents 7509fa02437f (current diff) fbe4bbd847e5 (diff)
children 68ec7b9e09a4
files
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Wed Nov 16 19:19:39 2005 +0100
+++ b/setup.py	Thu Nov 17 19:18:33 2005 +0100
@@ -75,7 +75,7 @@
     py2exe_opts = {}
     if py2exe_for_demandload is not None:
         cmdclass['py2exe'] = py2exe_for_demandload
-        py2exe_opts['console'] = 'hg'
+        py2exe_opts['console'] = ['hg']
     setup(name='mercurial',
           version=mercurial.version.get_version(),
           author='Matt Mackall',
--- a/templates/notfound.tmpl	Wed Nov 16 19:19:39 2005 +0100
+++ b/templates/notfound.tmpl	Thu Nov 17 19:18:33 2005 +0100
@@ -5,7 +5,7 @@
 
 <h2>Mercurial Repositories</h2>
 
-The specified repository "#repo#" is unknown, sorry.
+The specified repository "#repo|escape#" is unknown, sorry.
 
 Please go back to the main repository list page.
 
--- a/templates/tags.tmpl	Wed Nov 16 19:19:39 2005 +0100
+++ b/templates/tags.tmpl	Thu Nov 17 19:18:33 2005 +0100
@@ -1,5 +1,5 @@
 #header#
-<title>#repo#: tags</title>
+<title>#repo|escape#: tags</title>
 </head>
 <body>