ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-02-16 10:55:25 +01:00
parent a30ede80a6 b220b647d4
commit 3d12cff8a5
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/Manual.txt
View File

@ -1,7 +1,7 @@
<!-- HTML_ONLY --> <!-- HTML_ONLY -->
<HEAD> <HEAD>
<TITLE>LAMMPS Users Manual</TITLE> <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="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."> <META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
</HEAD> </HEAD>
@ -21,7 +21,7 @@
<H1></H1> <H1></H1>
LAMMPS Documentation :c,h3 LAMMPS Documentation :c,h3
17 Jan 2018 version :c,h4 5 Feb 2018 version :c,h4
Version info: :h4 Version info: :h4

2
src/version.h
View File

@ -1 +1 @@
#define LAMMPS_VERSION "17 Jan 2018" #define LAMMPS_VERSION "5 Feb 2018"

3
tools/pymol_asphere/src/error.cpp
View File

@ -13,7 +13,8 @@
#include "error.h" #include "error.h"
#include <cstring> #include <cstring>
#include <cstdlib>
Notice::Notice() { Notice::Notice() {
nullout=new ostream(NULL); nullout=new ostream(NULL);
noteout=&cout; noteout=&cout;