diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-01-01 16:06:17 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-01-01 16:06:17 +0100 |
| commit | 60b23bdeac7a712e107f62af1183f8495bb1d74c (patch) | |
| tree | 9b1cc9ff999c71c672e6fa0ea8dd7d89d9d8934b /mk | |
| parent | bd7c2a59e8ec5080b128ddbba51ce6eb799176e3 (diff) | |
| parent | 98cd4687a23956e3dc6cd9416a7ae867dcf22695 (diff) | |
Merge branch 'maint'
Conflicts:
contrib/lisp/htmlize.el
etc/schema/od-manifest-schema-v1.2-os.rnc
etc/schema/od-schema-v1.2-os.rnc
lisp/org-exp-blocks.el
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/eldo.el | 2 | ||||
| -rwxr-xr-x | mk/orgcard2txt.pl | 2 | ||||
| -rwxr-xr-x | mk/pw | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mk/eldo.el b/mk/eldo.el index 97d0f8567..96587dfcf 100644 --- a/mk/eldo.el +++ b/mk/eldo.el @@ -1,6 +1,6 @@ ;;; eldo.el --- Elisp Doc-to-Org converter -;; Copyright (C) 2012 Bastien Guerry +;; Copyright (C) 2012, 2013 Bastien Guerry ;; ;; Author: Bastien Guerry <bzg at gnu dot org> ;; Keywords: elisp, documentation, org diff --git a/mk/orgcard2txt.pl b/mk/orgcard2txt.pl index c5d942cf5..0a399d22b 100755 --- a/mk/orgcard2txt.pl +++ b/mk/orgcard2txt.pl @@ -1,5 +1,5 @@ # orgcard2txt.pl - a script to generate orgcard.txt from orgcard.tex -# Copyright (C) 2010 Osamu OKANO +# Copyright (C) 2010, 2013 Osamu OKANO # # Version: 0.1 # @@ -1,7 +1,7 @@ #!/usr/bin/env python # # Patchwork command line client -# Copyright (C) 2008 Nate Case <ncase@xes-inc.com> +# Copyright (C) 2008, 2013 Nate Case <ncase@xes-inc.com> # # This file is part of the Patchwork package. # |