diff options
| author | Paul Eggert | 2011-08-16 11:48:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-08-16 11:48:49 -0700 |
| commit | bc81e2c4e885787603da3e0314d6ea45a43f7862 (patch) | |
| tree | c3da7331f40c60b0ebb434d15f83ce027188d5e9 /etc | |
| parent | a69fbedbd629c3e46a23095486617482fb1228c5 (diff) | |
| parent | b215eee57d8427ac896f42a9546930cd852a1637 (diff) | |
| download | emacs-bc81e2c4e885787603da3e0314d6ea45a43f7862.tar.gz emacs-bc81e2c4e885787603da3e0314d6ea45a43f7862.zip | |
Merge from trunk.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/ChangeLog | 24 | ||||
| -rw-r--r-- | etc/refcards/orgcard.tex | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 6d89746ed05..0e31638a9af 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -1,27 +1,27 @@ | |||
| 1 | 2011-07-30 Chong Yidong <cyd@stupidchicken.com> | 1 | 2011-08-15 Carsten Dominik <carsten.dominik@gmail.com> |
| 2 | |||
| 3 | * grammars: New directory. | ||
| 4 | |||
| 5 | 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> | ||
| 6 | |||
| 7 | * NEWS: Document ## and #:. | ||
| 8 | |||
| 9 | 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> | ||
| 10 | 2 | ||
| 11 | * refcards/orgcard.tex: Document `org-copy-visible'. | 3 | * refcards/orgcard.tex: Document `org-copy-visible'. |
| 12 | 4 | ||
| 13 | 2011-07-28 Eric Schulte <schulte.eric@gmail.com> | 5 | 2011-08-15 Eric Schulte <schulte.eric@gmail.com> |
| 14 | 6 | ||
| 15 | * refcards/orgcard.tex: Documentation of new Babel function. | 7 | * refcards/orgcard.tex: Documentation of new Babel function. |
| 16 | 8 | ||
| 17 | 2011-07-28 Eric Schulte <schulte.eric@gmail.com> | 9 | 2011-08-15 Eric Schulte <schulte.eric@gmail.com> |
| 18 | 10 | ||
| 19 | * refcards/orgcard.tex: Adding line for org-babel-check-src-block. | 11 | * refcards/orgcard.tex: Adding line for org-babel-check-src-block. |
| 20 | 12 | ||
| 21 | 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> | 13 | 2011-08-15 Carsten Dominik <carsten.dominik@gmail.com> |
| 22 | 14 | ||
| 23 | * refcards/orgcard.tex: Document key for clock consistency check. | 15 | * refcards/orgcard.tex: Document key for clock consistency check. |
| 24 | 16 | ||
| 17 | 2011-07-30 Chong Yidong <cyd@stupidchicken.com> | ||
| 18 | |||
| 19 | * grammars: New directory. | ||
| 20 | |||
| 21 | 2011-07-28 Andreas Schwab <schwab@linux-m68k.org> | ||
| 22 | |||
| 23 | * NEWS: Document ## and #:. | ||
| 24 | |||
| 25 | 2011-07-18 Andreas Schwab <schwab@linux-m68k.org> | 25 | 2011-07-18 Andreas Schwab <schwab@linux-m68k.org> |
| 26 | 26 | ||
| 27 | * charsets/GB180302.map: Update to 2005 edition. | 27 | * charsets/GB180302.map: Update to 2005 edition. |
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index e4d5c62a4ea..09042786456 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex | |||
| @@ -686,4 +686,4 @@ your own key as shown under INSTALLATION. | |||
| 686 | % compile-command: "tex refcard" | 686 | % compile-command: "tex refcard" |
| 687 | % End: | 687 | % End: |
| 688 | 688 | ||
| 689 | % arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290 | 689 | |