Skip to content
Snippets Groups Projects
Commit 06a4f47a authored by Richard Berger's avatar Richard Berger
Browse files

Merge remote-tracking branch 'upstream/master' into small_updates

parents 9593e05c 2225fce9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/src/Manual.txt
+ 2
− 2
View file @ 06a4f47a
<!-- HTML_ONLY -->
<HEAD>
<TITLE>LAMMPS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="4 May 2017 version">
<META NAME="docnumber" CONTENT="19 May 2017 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
4 May 2017 version :c,h4
19 May 2017 version :c,h4
Version info: :h4
......
src/version.h
+ 1
− 1
View file @ 06a4f47a
#define LAMMPS_VERSION "4 May 2017"
#define LAMMPS_VERSION "19 May 2017"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment