diff options
| author | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /lisp/org | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 16097c1c0b2..019fa8a358d 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -3983,7 +3983,7 @@ | |||
| 3983 | (org-export-latex-tables-tend): New options. | 3983 | (org-export-latex-tables-tend): New options. |
| 3984 | (org-export-latex-tables): Use the new options. | 3984 | (org-export-latex-tables): Use the new options. |
| 3985 | 3985 | ||
| 3986 | 2012-09-30 tumashu <tumashu@gmail.com> (tiny change) | 3986 | 2012-09-30 Feng Shu <tumashu@gmail.com> (tiny change) |
| 3987 | 3987 | ||
| 3988 | * org-exp.el (org-export-language-setup): Add simplified chinese | 3988 | * org-exp.el (org-export-language-setup): Add simplified chinese |
| 3989 | translation. | 3989 | translation. |
| @@ -9437,7 +9437,7 @@ | |||
| 9437 | (org-update-checkbox-count-maybe): Add an optional argument passed to | 9437 | (org-update-checkbox-count-maybe): Add an optional argument passed to |
| 9438 | org-update-checkbox-count. | 9438 | org-update-checkbox-count. |
| 9439 | 9439 | ||
| 9440 | 2011-07-28 Ted Zlatanov <tzz@lifelogs.com> | 9440 | 2011-07-28 Teodor Zlatanov <tzz@lifelogs.com> |
| 9441 | 9441 | ||
| 9442 | * org.el (org-fontify-meta-lines-and-blocks): Ignore errors. | 9442 | * org.el (org-fontify-meta-lines-and-blocks): Ignore errors. |
| 9443 | 9443 | ||
| @@ -18000,7 +18000,7 @@ | |||
| 18000 | * org-habit.el (org-habit-build-graph): Help-echo date when | 18000 | * org-habit.el (org-habit-build-graph): Help-echo date when |
| 18001 | mouse is over stars. | 18001 | mouse is over stars. |
| 18002 | 18002 | ||
| 18003 | 2010-07-19 Jan Böker <jan.boecker@jboecker.de> | 18003 | 2010-07-19 Jan Böcker <jan.boecker@jboecker.de> |
| 18004 | 18004 | ||
| 18005 | * org.el (org-file-apps): Improve docstring to reflect | 18005 | * org.el (org-file-apps): Improve docstring to reflect |
| 18006 | grouping matches. | 18006 | grouping matches. |