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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 28 2014, 16:11.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/fix_omp.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 28 2014, 16:11

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
7e5b15bb90c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11345 f3b2605a-c512-4ea7…	Jan 27 2014
87e52e2a56de	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11343 f3b2605a-c512-4ea7…	Jan 27 2014
703de42fedda	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11342 f3b2605a-c512-4ea7…	Jan 27 2014
9b1cc599f6f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11341 f3b2605a-c512-4ea7…	Jan 27 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			src/MOLECULE/atom_vec_template.cpp
	M			src/MOLECULE/atom_vec_template.h
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/MOLECULE/pair_hbond_dreiding_morse.cpp
	M			src/RIGID/fix_shake.cpp
	M			src/USER-OMP/fix_omp.cpp
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/neigh_bond.cpp
	M			src/neigh_full.cpp
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_multi.cpp
	M			src/neigh_half_nsq.cpp
	M			src/neigh_respa.cpp
	M			src/version.h