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

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

Browse Source 
# Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
This commit is contained in:
Axel Kohlmeyer
2015-07-07 07:39:44 -04:00
parent 0449d00dca 217fdbc360
commit 42ff3a7aba
47 changed files with 22408 additions and 7839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Manual.html
View File

@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>LAMMPS-ICMS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="2 Jul 2015 version">
<META NAME="docnumber" CONTENT="6 Jul 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>
@ -22,7 +22,7 @@
<CENTER><H3>LAMMPS-ICMS Documentation
</H3></CENTER>
<CENTER><H4>2 Jul 2015 version
<CENTER><H4>6 Jul 2015 version
</H4></CENTER>
<H4>Version info:
</H4>