Mercurial > hg
comparison hgext/inotify/linuxserver.py @ 10264:d6512b3e9ac0
Merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 19 Jan 2010 22:45:09 -0600 |
parents | hgext/inotify/server.py@25e572394f5c hgext/inotify/server.py@0ce645cc3f20 |
children | 08a0f04b56bd |
comparison
equal
deleted
inserted
replaced
10260:fe699ca08a45 | 10264:d6512b3e9ac0 |
---|---|
2 # | 2 # |
3 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> | 3 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> |
4 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> | 4 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> |
5 # | 5 # |
6 # This software may be used and distributed according to the terms of the | 6 # This software may be used and distributed according to the terms of the |
7 # GNU General Public License version 2, incorporated herein by reference. | 7 # GNU General Public License version 2 or any later version. |
8 | 8 |
9 from mercurial.i18n import _ | 9 from mercurial.i18n import _ |
10 from mercurial import osutil, util | 10 from mercurial import osutil, util |
11 import common | 11 import common |
12 import server | 12 import server |