[pypy-commit] extradoc extradoc: move stuff around

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: extradoc
Changeset: r4918:6638dbe09bbf
Date: 2012-11-16 09:14 +0100
http://bitbucket.org/pypy/extradoc/changeset/6638dbe09bbf/

Log:	move stuff around

diff --git a/talk/rupy2012/pyconza2012/Makefile b/talk/rupy2012/talk/Makefile
rename from talk/rupy2012/pyconza2012/Makefile
rename to talk/rupy2012/talk/Makefile
diff --git a/talk/rupy2012/pyconza2012/author.latex b/talk/rupy2012/talk/author.latex
rename from talk/rupy2012/pyconza2012/author.latex
rename to talk/rupy2012/talk/author.latex
diff --git a/talk/rupy2012/pyconza2012/beamerdefs.txt b/talk/rupy2012/talk/beamerdefs.txt
rename from talk/rupy2012/pyconza2012/beamerdefs.txt
rename to talk/rupy2012/talk/beamerdefs.txt
diff --git a/talk/rupy2012/pyconza2012/examples/alloc.py b/talk/rupy2012/talk/examples/alloc.py
rename from talk/rupy2012/pyconza2012/examples/alloc.py
rename to talk/rupy2012/talk/examples/alloc.py
diff --git a/talk/rupy2012/pyconza2012/examples/calls.py b/talk/rupy2012/talk/examples/calls.py
rename from talk/rupy2012/pyconza2012/examples/calls.py
rename to talk/rupy2012/talk/examples/calls.py
diff --git a/talk/rupy2012/pyconza2012/examples/datastructure.py b/talk/rupy2012/talk/examples/datastructure.py
rename from talk/rupy2012/pyconza2012/examples/datastructure.py
rename to talk/rupy2012/talk/examples/datastructure.py
diff --git a/talk/rupy2012/pyconza2012/examples/interpreter.py b/talk/rupy2012/talk/examples/interpreter.py
rename from talk/rupy2012/pyconza2012/examples/interpreter.py
rename to talk/rupy2012/talk/examples/interpreter.py
--- a/talk/rupy2012/pyconza2012/examples/interpreter.py
+++ b/talk/rupy2012/talk/examples/interpreter.py
@@ -60,13 +60,3 @@
             pos = arg0
             continue
         pos += 1
-
-
-def f(a, b):
-    return a + b
-
-stack.append(variables[arg0])
-stack.append(variables[arg0])
-right = stack.pop()
-left = stack.pop()
-stack.append(left.add(right))
diff --git a/talk/rupy2012/pyconza2012/examples/jit01.py b/talk/rupy2012/talk/examples/jit01.py
rename from talk/rupy2012/pyconza2012/examples/jit01.py
rename to talk/rupy2012/talk/examples/jit01.py
diff --git a/talk/rupy2012/pyconza2012/stm-talk/Makefile b/talk/rupy2012/talk/stm-talk/Makefile
rename from talk/rupy2012/pyconza2012/stm-talk/Makefile
rename to talk/rupy2012/talk/stm-talk/Makefile
diff --git a/talk/rupy2012/pyconza2012/stm-talk/author.latex b/talk/rupy2012/talk/stm-talk/author.latex
rename from talk/rupy2012/pyconza2012/stm-talk/author.latex
rename to talk/rupy2012/talk/stm-talk/author.latex
diff --git a/talk/rupy2012/pyconza2012/stm-talk/beamerdefs.txt b/talk/rupy2012/talk/stm-talk/beamerdefs.txt
rename from talk/rupy2012/pyconza2012/stm-talk/beamerdefs.txt
rename to talk/rupy2012/talk/stm-talk/beamerdefs.txt
diff --git a/talk/rupy2012/pyconza2012/stm-talk/demo1.py b/talk/rupy2012/talk/stm-talk/demo1.py
rename from talk/rupy2012/pyconza2012/stm-talk/demo1.py
rename to talk/rupy2012/talk/stm-talk/demo1.py
diff --git a/talk/rupy2012/pyconza2012/stm-talk/standards.png b/talk/rupy2012/talk/stm-talk/standards.png
rename from talk/rupy2012/pyconza2012/stm-talk/standards.png
rename to talk/rupy2012/talk/stm-talk/standards.png
diff --git a/talk/rupy2012/pyconza2012/stm-talk/stylesheet.latex b/talk/rupy2012/talk/stm-talk/stylesheet.latex
rename from talk/rupy2012/pyconza2012/stm-talk/stylesheet.latex
rename to talk/rupy2012/talk/stm-talk/stylesheet.latex
diff --git a/talk/rupy2012/pyconza2012/stm-talk/talk.rst b/talk/rupy2012/talk/stm-talk/talk.rst
rename from talk/rupy2012/pyconza2012/stm-talk/talk.rst
rename to talk/rupy2012/talk/stm-talk/talk.rst
diff --git a/talk/rupy2012/pyconza2012/stm-talk/title.latex b/talk/rupy2012/talk/stm-talk/title.latex
rename from talk/rupy2012/pyconza2012/stm-talk/title.latex
rename to talk/rupy2012/talk/stm-talk/title.latex
diff --git a/talk/rupy2012/pyconza2012/stylesheet.latex b/talk/rupy2012/talk/stylesheet.latex
rename from talk/rupy2012/pyconza2012/stylesheet.latex
rename to talk/rupy2012/talk/stylesheet.latex
diff --git a/talk/rupy2012/pyconza2012/talk.pdf b/talk/rupy2012/talk/talk.pdf
rename from talk/rupy2012/pyconza2012/talk.pdf
rename to talk/rupy2012/talk/talk.pdf
index 8eb88f4bb2440dcede688672bdf6b31b30be2d4d..9340411c09a67d89bace98845a3074faf4846e6c
GIT binary patch

[cut]

diff --git a/talk/rupy2012/pyconza2012/talk.rst b/talk/rupy2012/talk/talk.rst
rename from talk/rupy2012/pyconza2012/talk.rst
rename to talk/rupy2012/talk/talk.rst
diff --git a/talk/rupy2012/pyconza2012/title.latex b/talk/rupy2012/talk/title.latex
rename from talk/rupy2012/pyconza2012/title.latex
rename to talk/rupy2012/talk/title.latex
--- a/talk/rupy2012/pyconza2012/title.latex
+++ b/talk/rupy2012/talk/title.latex
@@ -1,5 +1,5 @@
 \begin{titlepage}
 \begin{figure}[h]
-\includegraphics[width=60px]{../img/py-web-new.png}
+\includegraphics[width=60px]{../../img/py-web-new.png}
 \end{figure}
 \end{titlepage}