Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 22 2012, 10:18.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-OMP/pair_lj_cut_tip4p_long_proxy_omp.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSce7ea4907908: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 22 2012, 10:18

Merged Changes

CommitAuthorDetailsCommitted
081640f42286pscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8986 f3b2605a-c512-4ea7… 
Oct 19 2012
25f111feaa9dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8985 f3b2605a-c512-4ea7… 
Oct 19 2012
493410e7edfdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8984 f3b2605a-c512-4ea7… 
Oct 19 2012
b8baeea98232sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8983 f3b2605a-c512-4ea7… 
Oct 19 2012
c62169953b63sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8982 f3b2605a-c512-4ea7… 
Oct 19 2012
0e28d227fe00sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8981 f3b2605a-c512-4ea7… 
Oct 19 2012
e4e9c4cb8867sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8979 f3b2605a-c512-4ea7… 
Oct 19 2012
18c87471627esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8978 f3b2605a-c512-4ea7… 
Oct 19 2012
ad302a878ba5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8977 f3b2605a-c512-4ea7… 
Oct 19 2012
8ac15dc83fe4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8976 f3b2605a-c512-4ea7… 
Oct 19 2012
f97c62c76ec6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8975 f3b2605a-c512-4ea7… 
Oct 19 2012