Merge branch 'patch-1' of https://github.com/evoyiatzis/lammps into collected-small-changes

2018-02-16 10:55:25 +01:00
parent a30ede80a6 b220b647d4
commit 3d12cff8a5
3 changed files with 5 additions and 4 deletions
--- a/doc/src/Manual.txt
+++ b/doc/src/Manual.txt
@ -1,7 +1,7 @@
 <!-- HTML_ONLY -->
 <HEAD>
 <TITLE>LAMMPS Users Manual</TITLE>
-<META NAME="docnumber" CONTENT="17 Jan 2018 version">
+<META NAME="docnumber" CONTENT="5 Feb 2018 version">
 <META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
 <META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
 </HEAD>
@ -21,7 +21,7 @@
 <H1></H1>

 LAMMPS Documentation :c,h3
-17 Jan 2018 version :c,h4
+5 Feb 2018 version :c,h4

 Version info: :h4

--- a/src/version.h
+++ b/src/version.h
@ -1 +1 @@
-#define LAMMPS_VERSION "17 Jan 2018"
+#define LAMMPS_VERSION "5 Feb 2018"
--- a/tools/pymol_asphere/src/error.cpp
+++ b/tools/pymol_asphere/src/error.cpp
@ -13,6 +13,7 @@

 #include "error.h"
 #include <cstring>
+#include <cstdlib>

 Notice::Notice() {
 	nullout=new ostream(NULL);