comparison mercurial/templatefilters.py @ 18731:c2d079387b2c

merge with stable
author Mads Kiilerich <madski@unity3d.com>
date Thu, 28 Feb 2013 14:51:59 +0100
parents 4e949b8e0930 a5d33446e46c
children 8eef5b93db9d
comparison
equal deleted inserted replaced
18720:0ade08dcb3c3 18731:c2d079387b2c
3 # Copyright 2005-2008 Matt Mackall <mpm@selenic.com> 3 # Copyright 2005-2008 Matt Mackall <mpm@selenic.com>
4 # 4 #
5 # This software may be used and distributed according to the terms of the 5 # This software may be used and distributed according to the terms of the
6 # GNU General Public License version 2 or any later version. 6 # GNU General Public License version 2 or any later version.
7 7
8 from i18n import _
8 import cgi, re, os, time, urllib 9 import cgi, re, os, time, urllib
9 import encoding, node, util, error 10 import encoding, node, util, error
10 import hbisect 11 import hbisect
11 12
12 def addbreaks(text): 13 def addbreaks(text):