Diffusion lammps 5838c3c5428e

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 6 2015, 15:26.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/RIGID/fix_rigid.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 6 2015, 15:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS3c864bd3179f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12881 f3b2605a-c512-4ea7…
rLAMMPS62b4652b8829: update colvars library to 10 dec 2014 version

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5838c3c5428e: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 6 2015, 15:26

Merged Changes

Commit	Author	Details	Committed
3c864bd3179f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12881 f3b2605a-c512-4ea7…	Jan 6 2015
2139d30bc419	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12876 f3b2605a-c512-4ea7…	Jan 5 2015
a34caad41a82	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12875 f3b2605a-c512-4ea7…	Jan 5 2015
ddeb3f59c139	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12874 f3b2605a-c512-4ea7…	Jan 5 2015
f9085bf02834	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12872 f3b2605a-c512-4ea7…	Jan 5 2015
8e4b5a135c7c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12870 f3b2605a-c512-4ea7…	Jan 5 2015
7f430f9e62cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12869 f3b2605a-c512-4ea7…	Jan 5 2015
53fb7a5c59b9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12868 f3b2605a-c512-4ea7…	Jan 5 2015
4a0b9a3c5ac0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12867 f3b2605a-c512-4ea7…	Jan 5 2015
7b8f7ed44d30	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12866 f3b2605a-c512-4ea7…	Jan 5 2015
626ae3f6936e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12865 f3b2605a-c512-4ea7…	Jan 5 2015
d194479a749d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12864 f3b2605a-c512-4ea7…	Jan 5 2015
a6c70d8a68b5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12863 f3b2605a-c512-4ea7…	Jan 5 2015
eb8a7d8d9750	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12862 f3b2605a-c512-4ea7…	Jan 5 2015
1b31895cee10	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12861 f3b2605a-c512-4ea7…	Jan 5 2015
44d9a3bf59f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12860 f3b2605a-c512-4ea7…	Jan 5 2015
1aefa8d62472	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12859 f3b2605a-c512-4ea7…	Jan 5 2015
32f47e4a9926	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12858 f3b2605a-c512-4ea7…	Jan 5 2015

Changes (41)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/fix.html
	M			doc/fix.txt
	A			doc/fix_atom_swap.html
	A			doc/fix_atom_swap.txt
	M			doc/fix_bond_swap.html
	M			doc/fix_bond_swap.txt
	M			doc/fix_vector.html
	M			doc/fix_vector.txt
	M			doc/neigh_modify.html
	M			doc/neigh_modify.txt
	M			doc/pair_srp.html
	M			doc/pair_srp.txt
	A			src/MC/fix_atom_swap.cpp
	A			src/MC/fix_atom_swap.h
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_nh.cpp
	M			src/RIGID/fix_rigid_nh_small.cpp
	M			src/RIGID/fix_rigid_nh_small.h
	M			src/USER-INTEL/fix_intel.cpp
	M			src/USER-INTEL/pair_gayberne_intel.cpp
	M			src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/USER-MISC/fix_srp.cpp
	M			src/USER-MISC/pair_srp.cpp
	M			src/USER-OMP/fix_rigid_nh_omp.cpp
	M			src/fix_vector.cpp
	M			src/fix_vector.h
	M			src/math_extra.cpp
	M			src/math_extra.h
	M			src/neighbor.cpp
	M			src/version.h