#
#
# patch "wiki/InterfacesFrontendsAndTools.mdwn"
#  from [6a53fe35a8cfc0b75f7b9eda4d468a0f5ecd8934]
#    to [359865fd34f83b7966b0fa796378bfd3b421019d]
#
============================================================
--- wiki/InterfacesFrontendsAndTools.mdwn	6a53fe35a8cfc0b75f7b9eda4d468a0f5ecd8934
+++ wiki/InterfacesFrontendsAndTools.mdwn	359865fd34f83b7966b0fa796378bfd3b421019d
@@ -13,12 +13,12 @@
  * **[mtn-browse](http://www.coosoft.plus.com/software.html)**: A Perl/Gtk2 based graphical database browser for Monotone (requires no workspace). State: Beta (stable). [Latest development version](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.contrib.mtn-browse) (via viewmtn).
  * **[TracMonotone](http://tracmtn.1erlei.de/)**: A version control system plugin for **[Trac](http://trac.edgewall.com)** a popular integrated history browser/wiki/bug tracker. Latest [stable](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.trac-plugin)/[development](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.trac-plugin.twisted) version.
  * **Usher**: A server manager that can be used to serve several projects on the same IP/port, starting and stopping servers as needed. In branch `net.venge.monotone.contrib.usher`.
- * **[meld](http://meld.sf.net)**: a general diff, merge, and history browsing tool written in [Python](http://python.org) for [Gnome](http://gnome.org). Has monotone support since 1.1.3.
  * **[Monotone::AutomateStdio](http://www.coosoft.plus.com/software.html)**: A Perl library for interfacing with Monotone via its automate stdio interface. State: Stable. [Latest development version](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.contrib.lib.automate-stdio) (via viewmtn).
  * **shell completion**: monotone ships with completion scripts for both bash and zsh, in the `contrib/` directory of monotone's source tree. Latest versions for [bash](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone.bash_completion) and [zsh](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone.zsh_completion) (via viewmtn).
  * **Emacs** integration:
    * **monotone.el**: In `contrib/` directory of monotone's source tree. [Latest version](http://mtn-view.1erlei.de/branch/head/file/net.venge.monotone/contrib/monotone.el) (via viewmtn).
    * **[DVC](http://download.gna.org/dvc/)** (see also [DVC](http://gna.org/projects/dvc)) is a project to create a generic library for fancy Emacs interfaces to modern version control systems.  DVC includes monotone support.
+ * **[meld](http://meld.sf.net)**: a general diff, merge, and history browsing tool written in [Python](http://python.org) for [Gnome](http://gnome.org). Has monotone support since 1.1.3.
  * "**dumb server**" support, for publishing repositories via ordinary ftp/http/sftp/local filesystem: in branch [net.venge.monotone.dumb](http://mtn-view.1erlei.de/branch/changes/net.venge.monotone.dumb).
  * **[m7](http://www.midwinter.com/~lch/programming/m7/)**: Experimental drop-in command-line wrapper for monotone. Adds simple local version numbers (no longer using certs) and an enhanced annotate front-end.
  * **monotree**: Java app for browsing and visualizing history; more portable than monotone-viz. In branch `net.venge.monotone.contrib.monotree`.