Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 10 2013, 10:03.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/MOLECULE/atom_vec_full.cpp
src/REPLICA/prd.cpp
src/atom_vec_charge.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc1b6654dbc9c: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 10 2013, 10:03

Merged Changes

CommitAuthorDetailsCommitted
a698f27d85efsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9851 f3b2605a-c512-4ea7… 
May 8 2013
f4c29bb4d81bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9850 f3b2605a-c512-4ea7… 
May 8 2013
07b41bfb6eb8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9848 f3b2605a-c512-4ea7… 
May 8 2013
7018102f9f78sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9847 f3b2605a-c512-4ea7… 
May 8 2013
bfdbe3ab8764sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9846 f3b2605a-c512-4ea7… 
May 8 2013
c6ca56eff181sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9845 f3b2605a-c512-4ea7… 
May 8 2013
071e06b830c6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9839 f3b2605a-c512-4ea7… 
May 8 2013
cb8ee74bcc3bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9838 f3b2605a-c512-4ea7… 
May 8 2013
07071dccd97bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9837 f3b2605a-c512-4ea7… 
May 8 2013
f4714d9c4122sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9836 f3b2605a-c512-4ea7… 
May 8 2013
7e5fec4f3d3asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9835 f3b2605a-c512-4ea7… 
May 8 2013
0ca04bc6b350sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9834 f3b2605a-c512-4ea7… 
May 8 2013
bca7913e816dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9833 f3b2605a-c512-4ea7… 
May 8 2013
173f495c3e7asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9832 f3b2605a-c512-4ea7… 
May 8 2013
22fec817cf48sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9831 f3b2605a-c512-4ea7… 
May 8 2013
55b4f3efb89asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9829 f3b2605a-c512-4ea7… 
May 8 2013
9248a54da604sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9828 f3b2605a-c512-4ea7… 
May 8 2013
2ea27db3ddafsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9827 f3b2605a-c512-4ea7… 
May 8 2013
b1c03442afb1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9825 f3b2605a-c512-4ea7… 
May 8 2013
d1c38bbe2bbcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9824 f3b2605a-c512-4ea7… 
May 8 2013
def6733a9a4csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9823 f3b2605a-c512-4ea7… 
May 8 2013
9710ebfa4a66sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9810 f3b2605a-c512-4ea7… 
May 7 2013
a4341de03820sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9809 f3b2605a-c512-4ea7… 
May 7 2013
b7da4d691ce9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9808 f3b2605a-c512-4ea7… 
May 7 2013
03aeb17625d9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9807 f3b2605a-c512-4ea7… 
May 7 2013