ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of code.orgmode.org:bzg/org-mode

This commit is contained in:
Bastien 2018-12-01 13:30:40 +01:00
parent d9ab07042a 04641c4bbe
commit a484c67586
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lisp/org-pcomplete.el
View File

@ -64,6 +64,7 @@
(defvar org-outline-regexp) (defvar org-outline-regexp)
(defvar org-property-re) (defvar org-property-re)
(defvar org-startup-options) (defvar org-startup-options)
(defvar org-tag-re)
(defvar org-time-stamp-formats) (defvar org-time-stamp-formats)
(defvar org-todo-keywords-1) (defvar org-todo-keywords-1)
(defvar org-todo-line-regexp) (defvar org-todo-line-regexp)

2
lisp/ox-latex.el
View File

@ -179,7 +179,7 @@
("et" . "estonian") ("et" . "estonian")
("eu" . "basque") ("eu" . "basque")
("fi" . "finnish") ("fi" . "finnish")
("fr" . "frenchb") ("fr" . "french")
("fr-ca" . "canadien") ("fr-ca" . "canadien")
("gl" . "galician") ("gl" . "galician")
("hr" . "croatian") ("hr" . "croatian")