Merge remote branch 'upstream/master'

espressomd · Feb 17, 2012 · 30989af · 30989af
2 parents c69f061 + afcd8a4
commit 30989af
Show file tree

Hide file tree

Showing 5 changed files with 463 additions and 438 deletions.
diff --git a/doc/ug/Makefile.am b/doc/ug/Makefile.am
@@ -26,6 +26,7 @@ ug_TEXFILES = \
 	setup.tex \
 	run.tex \
 	analysis.tex \
+	analysis-core.tex \
 	io.tex \
 	lb.tex \
 	memd.tex \