Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

# Resolved Conflicts:
#	doc/Manual.txt
#	doc/pair_reax.html
This commit is contained in:
Axel Kohlmeyer
2015-12-22 07:49:35 -05:00
498 changed files with 1494 additions and 1494 deletions

View File

@ -1,7 +1,7 @@
<!-- HTML_ONLY -->
<HEAD>
<TITLE>LAMMPS-ICMS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="17 Dec 2015 version">
<META NAME="docnumber" CONTENT="19 Dec 2015 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-ICMS Documentation :c,h3
17 Dec 2015 version :c,h4
19 Dec 2015 version :c,h4
Version info: :h4