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

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

Browse Source 
Resolved Conflicts:
	doc/Eqs/improper_dist-1.jpg
	doc/Eqs/pair_mdf-1.jpg
	doc/Eqs/pair_mdf-2.jpg
	doc/Eqs/pair_mdf-3.jpg
	doc/Eqs/pair_mdf-4.jpg
	doc/Eqs/pair_mdf-5.jpg
	doc/Eqs/pair_mdf-6.jpg
	doc/Manual.html
	doc/Manual.txt
	doc/Section_commands.txt
	doc/dump_custom_vtk.txt
	doc/fix.txt
	lib/vtk/Makefile.lammps
	python/lammps.py
	src/Makefile
	src/USER-COLVARS/ndx_group.cpp
	src/USER-VTK/dump_custom_vtk.h
This commit is contained in:
Axel Kohlmeyer
2016-02-16 12:44:25 +01:00
parent 872c75754f abe869aaed
commit 1d9d6f9241
495 changed files with 21701 additions and 36670 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="jan-2016-version">
<h2>3 Feb 2016 version<a class="headerlink" href="#feb-2016-version" title="Permalink to this headline"></a></h2>
<div class="section" id="feb-2016-version">
<h2>17 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>