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/Eqs/pair_morse_smooth_linear.jpg
#	doc/Manual.html
#	doc/Manual.txt
#	doc/pair_morse.txt
This commit is contained in:
Axel Kohlmeyer
2016-03-02 17:38:06 -05:00
parent 5ee04e33b1 9b33b04183
commit 6e327ee1b3
47 changed files with 1862 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Manual.html
View File

@ -134,8 +134,8 @@
<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>25 Feb 2016 version<a class="headerlink" href="#feb-2016-version" title="Permalink to this headline"></a></h2>
<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>
</div>
<div class="section" id="version-info">
<h2>Version info:<a class="headerlink" href="#version-info" title="Permalink to this headline"></a></h2>