From: Alexey Veretennikov <alexey.veretennikov@gmail.com>
Date: Thu, 11 Jun 2015 19:37:52 +0000 (+0200)
Subject: Merge remote-tracking branch 'ztree/master'
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/1dbb290194394865ed67b967e19e9af1149e2641?hp=-c

Merge remote-tracking branch 'ztree/master'

Replaced pkg file with autogenerated for ztree package.
---

1dbb290194394865ed67b967e19e9af1149e2641
diff --combined packages/ztree/ztree-pkg.el
index 4665dae20,2ee40ca10..2ee40ca10
--- a/packages/ztree/ztree-pkg.el
+++ b/packages/ztree/ztree-pkg.el
@@@ -1,4 -1,2 +1,2 @@@
- ;;; ztree-pkg.el --- Package file for MELPA/ELPA
- (define-package "ztree" "1.0.1"  "Several text-tree applications" :url "https://github.com/fourier/ztree" :keywords '("files" "tools"))
- 
- ;;; ztree-pkg.el ends here
+ ;; Generated package description from ztree.el
+ (define-package "ztree" "1.0.1" "Text mode directory tree" 'nil :url "https://github.com/fourier/ztree" :keywords '("files" "tools"))