merge default into stable for 3.0 code freeze stable 3.0-rc
authorMatt Mackall <mpm@selenic.com>
Thu, 17 Apr 2014 19:36:17 -0400
branchstable
changeset 21160 564f55b25122
parent 21028 a0f437e2f5a9 (diff)
parent 21159 024f38f6d5f6 (current diff)
child 21161 ef59019f4771
merge default into stable for 3.0 code freeze
contrib/tmplrewrite.py
hgext/inotify/__init__.py
hgext/inotify/client.py
hgext/inotify/common.py
hgext/inotify/linux/__init__.py
hgext/inotify/linux/_inotify.c
hgext/inotify/linux/watcher.py
hgext/inotify/linuxserver.py
hgext/inotify/server.py
hgext/interhg.py
tests/blacklists/inotify-failures
tests/test-inotify-debuginotify.t
tests/test-inotify-dirty-dirstate.t
tests/test-inotify-issue1371.t
tests/test-inotify-issue1542.t
tests/test-inotify-issue1556.t
tests/test-inotify-lookup.t
tests/test-inotify.t