Homec4science

Merge branch 'lammps-icms' into colvars-update

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 25 2013, 11:28.

Description

Merge branch 'lammps-icms' into colvars-update

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8f6a1fc04d48: Merge branch 'lammps-icms' into colvars-update (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 25 2013, 11:28

Merged Changes

CommitAuthorDetailsCommitted
3e7db1abd113Axel Kohlmeyer
go back to linking static libjpeg again 
May 25 2013
d7237b1ab707Axel Kohlmeyer
link jpeg regularly on mingw??-cross 
May 24 2013
5680a3f9bb9fAxel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
May 24 2013
c9247a0f40f1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9904 f3b2605a-c512-4ea7… 
May 24 2013
5b0c65e39857sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9903 f3b2605a-c512-4ea7… 
May 24 2013
12d5dc6e07b4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9902 f3b2605a-c512-4ea7… 
May 24 2013
60b9a09f770bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9901 f3b2605a-c512-4ea7… 
May 24 2013
e85fdb8d637fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9900 f3b2605a-c512-4ea7… 
May 23 2013
e2d965dac930sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9899 f3b2605a-c512-4ea7… 
May 23 2013
732d9d751789sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9897 f3b2605a-c512-4ea7… 
May 23 2013
e3b479a4cd57sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9896 f3b2605a-c512-4ea7… 
May 23 2013
b1af45327d66sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9895 f3b2605a-c512-4ea7… 
May 23 2013