aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/org/ob-python.el
diff options
context:
space:
mode:
authorPaul Eggert2012-01-07 11:51:13 -0800
committerPaul Eggert2012-01-07 11:51:13 -0800
commit9a0115abd18f219f234d6dd460cf7f5ed3c0332f (patch)
tree3ea55596e8d2fbb066b4387d86b509d8f8a1a612 /lisp/org/ob-python.el
parentdbf17d8b483f08f9506c19ef95e894fca62b8ec7 (diff)
parent6c1bd3f369c39aac648b085c5e9e4e9b42c65c62 (diff)
downloademacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.tar.gz
emacs-9a0115abd18f219f234d6dd460cf7f5ed3c0332f.zip
Merge from trunk.
Diffstat (limited to 'lisp/org/ob-python.el')
-rw-r--r--lisp/org/ob-python.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/org/ob-python.el b/lisp/org/ob-python.el
index 5234d83ecee..5e7a2f0e6b5 100644
--- a/lisp/org/ob-python.el
+++ b/lisp/org/ob-python.el
@@ -1,12 +1,11 @@
1;;; ob-python.el --- org-babel functions for python evaluation 1;;; ob-python.el --- org-babel functions for python evaluation
2 2
3;; Copyright (C) 2009-2011 Free Software Foundation 3;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
4 4
5;; Author: Eric Schulte 5;; Author: Eric Schulte
6;; Dan Davison 6;; Dan Davison
7;; Keywords: literate programming, reproducible research 7;; Keywords: literate programming, reproducible research
8;; Homepage: http://orgmode.org 8;; Homepage: http://orgmode.org
9;; Version: 7.7
10 9
11;; This file is part of GNU Emacs. 10;; This file is part of GNU Emacs.
12 11