Merge branch 'master' into lammps-icms
95f350087c9f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 24 2012, 15:03.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Section_packages.html
doc/Section_packages.txt
doc/dump_modify.txt
doc/fix_colvars.html
doc/fix_colvars.txt
src/Make.sh
src/Makefile
src/USER-COLVARS/colvarproxy_lammps.cpp
src/dump_xyz.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 24 2012, 15:03

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPScf97293d6cb5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8171 f3b2605a-c512-4ea7…
rLAMMPSe5a0e31d13ed: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS95f350087c9f: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 24 2012, 15:03

Merged Changes

Commit	Author	Details	Committed
cf97293d6cb5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8171 f3b2605a-c512-4ea7…	May 23 2012
da8c8b34fe29	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8170 f3b2605a-c512-4ea7…	May 23 2012
da194946be34	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8169 f3b2605a-c512-4ea7…	May 23 2012
a7cc0c2ae344	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8168 f3b2605a-c512-4ea7…	May 23 2012
032819687cac	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8166 f3b2605a-c512-4ea7…	May 23 2012
5ea3c4d23a0a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8165 f3b2605a-c512-4ea7…	May 23 2012
aa8aeb029472	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8164 f3b2605a-c512-4ea7…	May 23 2012
44904c5bf3e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8163 f3b2605a-c512-4ea7…	May 23 2012
1cfdda1f82b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8162 f3b2605a-c512-4ea7…	May 23 2012
191c2ca3e593	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8161 f3b2605a-c512-4ea7…	May 23 2012
123a9b569d8b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8160 f3b2605a-c512-4ea7…	May 23 2012
144f2f2fd6a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8159 f3b2605a-c512-4ea7…	May 23 2012
7941aa48ccfd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8158 f3b2605a-c512-4ea7…	May 23 2012
0c76a0a41546	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8157 f3b2605a-c512-4ea7…	May 23 2012
a3bee6a98b19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8156 f3b2605a-c512-4ea7…	May 23 2012
931260a4a2c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8155 f3b2605a-c512-4ea7…	May 23 2012
68f5b6d394a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8154 f3b2605a-c512-4ea7…	May 23 2012
365218d56f0e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8153 f3b2605a-c512-4ea7…	May 23 2012
c1e5db9ff043	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8152 f3b2605a-c512-4ea7…	May 23 2012
6053836d7c3e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8151 f3b2605a-c512-4ea7…	May 23 2012

Changes (47)

				Path
	M			doc/PDF/kspace.pdf
	M			doc/Section_packages.html
	M			doc/Section_packages.txt
	M			doc/compute_group_group.html
	M			doc/compute_group_group.txt
	M			doc/dump.html
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/fix_colvars.html
	M			doc/fix_colvars.txt
	M			doc/pair_brownian.html
	M			doc/pair_brownian.txt
	M			doc/pair_lubricate.html
	M			doc/pair_lubricate.txt
	M			doc/pair_lubricateU.html
	M			doc/pair_lubricateU.txt
	A			examples/USER/colvars/log.peptide-colvars-1
	A			examples/USER/colvars/log.peptide-colvars-4
	A			examples/USER/colvars/log.peptide-colvars2-1
	A			examples/USER/colvars/log.peptide-colvars2-4
	A			examples/USER/colvars/out.colvars.state
	A			examples/USER/colvars/out.colvars.traj
	A			examples/USER/colvars/out2.colvars.state
	A			examples/USER/colvars/out2.colvars.traj
	A			examples/USER/colvars/peptide2.colvars.state
	A			examples/USER/colvars/peptide2.colvars.traj
	M			src/FLD/pair_brownian.cpp
	M			src/FLD/pair_brownian.h
	M			src/FLD/pair_brownian_poly.cpp
	M			src/FLD/pair_lubricate.cpp
	M			src/FLD/pair_lubricate.h
	M			src/FLD/pair_lubricateU.cpp
	M			src/FLD/pair_lubricateU.h
	M			src/FLD/pair_lubricateU_poly.cpp
	M			src/FLD/pair_lubricateU_poly.h
	M			src/FLD/pair_lubricate_poly.cpp
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/pppm.cpp
	M			src/MANYBODY/pair_airebo.cpp
	M			src/Make.sh
	M			src/Makefile.lib
	M			src/USER-COLVARS/colvarproxy_lammps.cpp
	M			src/compute_group_group.cpp
	M			src/compute_group_group.h
	M			src/dump_xyz.cpp
	M			src/fix_wall.h
	M			src/version.h