diff options
| author | jave | 2015-01-02 16:30:55 +0100 |
|---|---|---|
| committer | jave | 2015-01-02 16:30:55 +0100 |
| commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
| tree | 829968643b451bd3f64c791e4d3a6c928010e14c /lisp/org/ob-java.el | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip | |
merge master
Diffstat (limited to 'lisp/org/ob-java.el')
| -rw-r--r-- | lisp/org/ob-java.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ob-java.el b/lisp/org/ob-java.el index 22f8785f3e2..660262e7e43 100644 --- a/lisp/org/ob-java.el +++ b/lisp/org/ob-java.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; ob-java.el --- org-babel functions for java evaluation | 1 | ;;; ob-java.el --- org-babel functions for java evaluation |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2011-2014 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2011-2015 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Schulte | 5 | ;; Author: Eric Schulte |
| 6 | ;; Keywords: literate programming, reproducible research | 6 | ;; Keywords: literate programming, reproducible research |