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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 29 2014, 13:26.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/colvars/colvar.cpp
lib/colvars/colvar.h
lib/colvars/colvaratoms.cpp
lib/colvars/colvarbias.cpp
lib/colvars/colvarbias.h
lib/colvars/colvarbias_abf.cpp
lib/colvars/colvarbias_abf.h
lib/colvars/colvarcomp.cpp
lib/colvars/colvarcomp.h
lib/colvars/colvarcomp_distances.cpp
lib/colvars/colvargrid.h
lib/colvars/colvarmodule.cpp
lib/colvars/colvarmodule.h
lib/colvars/colvarproxy.h
lib/colvars/colvartypes.h
lib/cuda/Makefile.lammps
src/USER-COLVARS/fix_colvars.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 29 2014, 13:26

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSc21dee6f5327: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12653 f3b2605a-c512-4ea7…
rLAMMPSa9e124db15cb: import last night's colvars updates

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS12dcd704610d: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 29 2014, 13:26

Merged Changes

Commit	Author	Details	Committed
c21dee6f5327	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12653 f3b2605a-c512-4ea7…	Oct 28 2014
1fbc2e928d1c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12652 f3b2605a-c512-4ea7…	Oct 28 2014
9f3c85870b4e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12651 f3b2605a-c512-4ea7…	Oct 28 2014
51a148df161c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12650 f3b2605a-c512-4ea7…	Oct 28 2014
7cea65198f78	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12649 f3b2605a-c512-4ea7…	Oct 28 2014
4c424964347a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12648 f3b2605a-c512-4ea7…	Oct 27 2014