Commit 3d12cff8 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

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

parents a30ede80 b220b647

doc/src/Manual.txt

+2 −2
Original line number Diff line number Diff line 
<!-- 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

src/version.h

+1 −1
Original line number Diff line number Diff line 
#define LAMMPS_VERSION "17 Jan 2018"
 
#define LAMMPS_VERSION "5 Feb 2018"

tools/pymol_asphere/src/error.cpp

+2 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include "error.h"

#include <cstring>

#include <cstdlib>



Notice::Notice() {

	nullout=new ostream(NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE