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 
#Resolved Conflicts:
#	doc/Manual.txt
#	src/MAKE/MACHINES/Makefile.mingw32-cross
#	src/MAKE/MACHINES/Makefile.mingw32-cross-mpi
#	src/MAKE/MACHINES/Makefile.mingw64-cross
#	src/MAKE/MACHINES/Makefile.mingw64-cross-mpi
#	src/MAKE/MINE/Makefile.g++
#	src/MAKE/Makefile.mpi
#	src/MAKE/Makefile.serial
#	src/Make.py
#	src/Makefile
This commit is contained in:
Axel Kohlmeyer
2016-03-11 06:45:09 -05:00
parent 93af809806 a946de0b03
commit 1cf0e40793
89 changed files with 2468 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Manual.html
View File

@ -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="mar-2016-version">
<h2>1 Mar 2016 version<a class="headerlink" href="#mar-2016-version" title="Permalink to this headline"></a></h2>
<h2>10 Mar 2016 version<a class="headerlink" href="#mar-2016-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>