Homec4science

Merge branch 'master' into ak-fix

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 24 2011, 19:49.

Description

Merge branch 'master' into ak-fix

Resolved Conflicts:
src/GPU/pair_cg_cmm_gpu.cpp
src/read_data.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc18174c0ece0: Merge branch 'master' into ak-fix (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 24 2011, 19:49

Merged Changes

CommitAuthorDetailsCommitted
afc72c791349sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7012 f3b2605a-c512-4ea7… 
Sep 24 2011
9c1ec9764e92sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7011 f3b2605a-c512-4ea7… 
Sep 24 2011
b942af38b223sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7010 f3b2605a-c512-4ea7… 
Sep 24 2011
6b73c2cdf802sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7009 f3b2605a-c512-4ea7… 
Sep 23 2011
c0a3d0aa9a8fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7008 f3b2605a-c512-4ea7… 
Sep 23 2011
7873e97fc350sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7006 f3b2605a-c512-4ea7… 
Sep 23 2011
e6fac7cd8a7bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7005 f3b2605a-c512-4ea7… 
Sep 23 2011
d296662af68csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7004 f3b2605a-c512-4ea7… 
Sep 23 2011
19e8c92a906esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7… 
Sep 23 2011
2d99de131d05sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7001 f3b2605a-c512-4ea7… 
Sep 23 2011
1ba435ee1865sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7000 f3b2605a-c512-4ea7… 
Sep 23 2011
cd6cff618686sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6999 f3b2605a-c512-4ea7… 
Sep 23 2011
1ab03c7ee003sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6998 f3b2605a-c512-4ea7… 
Sep 23 2011