--- /dev/null
+;; -*- emacs-lisp -*-
+
+;; List of packages that are maintained externally.
+;; The list is made of elements of the form (NAME KIND URL).
+;;
+;; Where NAME is the name of the package;
+;;
+;; KIND can be one of:
+;; :subtree = a "git subtree" in the `master' branch.
+;; :external = kept in a separate `externals/<name>' branch.
+;;
+;; And URL is the URL of the remote git repository that we want to track.
+;; It can be nil, in which case we don't track anything (useless for
+;; :subtree, but not for :external).
+
+;; The FIXMEs indicate that the branch can't be merged as is because it needs
+;; some manual intervention (typically, because the two branches have
+;; diverged).
+
+(("ack" :subtree "https://github.com/leoliu/ack-el")
+ ("auctex" :external "git://git.sv.gnu.org/auctex.git")
+ ;;FIXME:("cedet" :external "??")
+ ("chess" :external nil) ;; Was https://github.com/jwiegley/emacs-chess.git
+ ("coffee-mode" :subtree "https://github.com/defunkt/coffee-mode")
+ ("company" :subtree "https://github.com/company-mode/company-mode.git")
++ ("darkroom" :subtree "https://github.com/capitaomorte/darkroom.git")
+ ("diff-hl" :subtree "https://github.com/dgutov/diff-hl.git")
+ ("dismal" :external nil)
+ ("easy-kill" :subtree "https://github.com/leoliu/easy-kill")
+ ("eldoc-eval" :subtree "https://github.com/thierryvolpiatto/eldoc-eval.git")
+ ("enwc" :subtree "bzr::bzr://bzr.savannah.nongnu.org/enwc/trunk")
+ ("ergoemacs-mode" :external "https://github.com/ergoemacs/ergoemacs-mode.git")
+ ("f90-interface-browser" :subtree "https://github.com/wence-/f90-iface")
+ ("ggtags" :subtree "https://github.com/leoliu/ggtags")
+ ("gnorb" :subtree "https://github.com/girzel/gnorb")
+ ("ioccur" :subtree "https://github.com/thierryvolpiatto/ioccur.git")
+ ("js2-mode" :subtree "https://github.com/mooz/js2-mode.git")
+ ("pabbrev" :external "https://github.com/phillord/pabbrev.git")
+ ;;FIXME:("org" :external ??) ;; Need to introduce snapshots!!
+ ("rudel" :external nil) ;; Was bzr::bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk
+ ("temp-buffer-browse" :subtree "https://github.com/leoliu/temp-buffer-browse")
+ ;;FIXME:("vlf" :subtree ??)
+ ("w3" :external nil)
+ ("wcheck-mode" :subtree "https://github.com/tlikonen/wcheck-mode.git")
+ ("web-server" :subtree "https://github.com/eschulte/emacs-web-server.git")
+ ("websocket" :subtree "https://github.com/ahyatt/emacs-websocket.git")
+ ("yasnippet" :subtree "https://github.com/capitaomorte/yasnippet.git")
+ )