summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2014-06-02 20:10:48 +0200
committerAchim Gratz <Stromeko@Stromeko.DE>2014-06-02 20:10:48 +0200
commit45f840a6f1706ef4fa9a3cc7513f757c4c3ad41d (patch)
tree51af260b95f2c62dc19eee23c2eca1f6aa15f39f
parent3969268e2aa5f47e555e4d1e0bd34134d5e2ad49 (diff)
parent045fd4ed62db91c56e5c5da8991981f49ccf722b (diff)
downloadorg-mode-45f840a6f1706ef4fa9a3cc7513f757c4c3ad41d.tar.gz
Merge branch 'maint'
-rw-r--r--Makefile1
-rw-r--r--mk/server.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ce06116..f6312f2 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,6 @@ help helpall::
$(info )
$(info Getting Help)
$(info ============)
- $(info )
$(info make help - show brief help)
$(info make targets - ditto)
$(info make helpall - show extended help)
diff --git a/mk/server.mk b/mk/server.mk
index 4d9e9a9..8cc04ab 100644
--- a/mk/server.mk
+++ b/mk/server.mk
@@ -35,7 +35,7 @@ ORGFULL = README COPYING lisp/ \
Makefile request-assign-future.txt \
mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \
- etc/ contrib/ doc/
+ etc/ contrib/ doc/ testing/
ORGFULL := $(ORGFULL:%/=%/*)
ORGELPA = README_ELPA COPYING lisp/ \
doc/dir doc/org doc/orgcard.pdf \