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

Merge branch 'master' into lammps-icms

Browse Source 
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	doc/pair_reax.txt
#	doc/pair_reax_c.txt
#	src/MANYBODY/pair_polymorphic.cpp
This commit is contained in:
Axel Kohlmeyer
2015-12-11 07:33:14 -05:00
parent b2a75f111c 3b6a3f4e55
commit 5affb6c013
693 changed files with 6627 additions and 6544 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/Manual.html
View File

@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>LAMMPS-ICMS Documentation &mdash; LAMMPS 7 Dec 2015 version documentation</title>
<title>LAMMPS Documentation &mdash; LAMMPS 9 Dec 2015 documentation</title>
@ -32,7 +32,7 @@
<link rel="top" title="LAMMPS-ICMS 7 Dec 2015 version documentation" href="index.html"/>
<link rel="top" title="LAMMPS 9 Dec 2015 documentation" href="index.html"/>
<link rel="next" title="1. Introduction" href="Section_intro.html"/>
@ -135,7 +135,7 @@
<H1></H1><div class="section" id="lammps-documentation">
<h1>LAMMPS-ICMS Documentation<a class="headerlink" href="#lammps-documentation" title="Permalink to this headline"></a></h1>
<div class="section" id="dec-2015-version">
<h2>10 Dec 2015 version<a class="headerlink" href="#dec-2015-version" title="Permalink to this headline"></a></h2>
<h2>9 Dec 2015 version<a class="headerlink" href="#dec-2015-version" title="Permalink to this headline"></a></h2>
</div>
<div class="section" id="version-info">
<h2>Version info:<a class="headerlink" href="#version-info" title="Permalink to this headline"></a></h2>
@ -416,7 +416,7 @@ it gives quick access to documentation for all LAMMPS commands.</p>
<div role="contentinfo">
<p>
&copy; Copyright .
&copy; Copyright 2013 Sandia Corporation.
</p>
</div>
Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.
@ -437,7 +437,7 @@ it gives quick access to documentation for all LAMMPS commands.</p>
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'15 May 2015 version',
VERSION:'9 Dec 2015',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true