tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Achim Gratz 2014-06-02 20:10:48 +02:00
parent 3969268e2a 045fd4ed62
commit 45f840a6f1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -17,7 +17,6 @@ help helpall::
$(info ) $(info )
$(info Getting Help) $(info Getting Help)
$(info ============) $(info ============)
$(info )
$(info make help - show brief help) $(info make help - show brief help)
$(info make targets - ditto) $(info make targets - ditto)
$(info make helpall - show extended help) $(info make helpall - show extended help)

2
mk/server.mk
View File

@ -35,7 +35,7 @@ ORGFULL = README COPYING lisp/ \
Makefile request-assign-future.txt \ Makefile request-assign-future.txt \
mk/default.mk mk/targets.mk mk/version.mk \ mk/default.mk mk/targets.mk mk/version.mk \
mk/org-fixup.el \ mk/org-fixup.el \
etc/ contrib/ doc/ etc/ contrib/ doc/ testing/
ORGFULL := $(ORGFULL:%/=%/*) ORGFULL := $(ORGFULL:%/=%/*)
ORGELPA = README_ELPA COPYING lisp/ \ ORGELPA = README_ELPA COPYING lisp/ \
doc/dir doc/org doc/orgcard.pdf \ doc/dir doc/org doc/orgcard.pdf \