Commit 2831f507 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'integration' into doc-cleanups-and-updates

parents 523c70e0 2fb666dc

doc/html/Manual.html

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ 
  <H1></H1><div class="section" id="lammps-documentation">

<h1>LAMMPS Documentation</h1>

<div class="section" id="sep-2016-version">

<h2>7 Sep 2016 version</h2>

<h2>13 Sep 2016 version</h2>

</div>

<div class="section" id="version-info">

<h2>Version info:</h2>

doc/html/Section_tools.html

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ own sub-directories with their own Makefiles.</p> 
<li><a class="reference internal" href="#eff"><span class="std std-ref">eff</span></a></li>

<li><a class="reference internal" href="#emacs"><span class="std std-ref">emacs</span></a></li>

<li><a class="reference internal" href="#fep"><span class="std std-ref">fep</span></a></li>

<li><a class="reference internal" href="#ipi"><span class="std std-ref">i-pi</span></a></li>

<li><a class="reference internal" href="fix_ipi.html#ipi"><span class="std std-ref">i-pi</span></a></li>

<li><a class="reference internal" href="#ipp"><span class="std std-ref">ipp</span></a></li>

<li><a class="reference internal" href="#kate"><span class="std std-ref">kate</span></a></li>

<li><a class="reference internal" href="#arc"><span class="std std-ref">lmp2arc</span></a></li>

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="7 Sep 2016 version">

<META NAME="docnumber" CONTENT="13 Sep 2016 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

7 Sep 2016 version :c,h4

13 Sep 2016 version :c,h4



Version info: :h4

src/version.h

+1 −1
Original line number Diff line number Diff line 
#define LAMMPS_VERSION "7 Sep 2016"
 
#define LAMMPS_VERSION "13 Sep 2016"

CRA Git | Maintained and supported by SUSTech CRA and CCSE