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
This commit is contained in:
Axel Kohlmeyer
2016-02-26 06:35:21 -05:00
parent 05fe174d76 4351bad69f
commit 2702d94cfd
8 changed files with 79 additions and 12 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="feb-2016-version">
<h2>22 Feb 2016 version<a class="headerlink" href="#feb-2016-version" title="Permalink to this headline"></a></h2>
<h2>25 Feb 2016 version<a class="headerlink" href="#feb-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>