Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 13 2013, 13:56.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/pppm_cg_omp.cpp
src/USER-OMP/pppm_cg_omp.h
src/USER-OMP/pppm_omp.cpp
src/USER-OMP/pppm_omp.h
src/USER-OMP/pppm_tip4p_omp.cpp
src/kspace.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS3cd3e2febd37: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 13 2013, 13:56

Merged Changes

CommitAuthorDetailsCommitted
55cb9649a386sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9471 f3b2605a-c512-4ea7… 
Feb 13 2013
6d707ca5ebdbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9470 f3b2605a-c512-4ea7… 
Feb 13 2013
529a4896106dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9466 f3b2605a-c512-4ea7… 
Feb 13 2013
b040b785e2d2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9465 f3b2605a-c512-4ea7… 
Feb 13 2013
52b9d7d9b5desjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9464 f3b2605a-c512-4ea7… 
Feb 13 2013
e8e811435230sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9463 f3b2605a-c512-4ea7… 
Feb 13 2013
4d6b9be28c00sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9462 f3b2605a-c512-4ea7… 
Feb 13 2013
687db51a45b7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9461 f3b2605a-c512-4ea7… 
Feb 13 2013
13a59d2573f5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9460 f3b2605a-c512-4ea7… 
Feb 13 2013
c521201ea53dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9459 f3b2605a-c512-4ea7… 
Feb 13 2013
bcab6e829a67sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9458 f3b2605a-c512-4ea7… 
Feb 13 2013
97a23ad84932sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9457 f3b2605a-c512-4ea7… 
Feb 13 2013
9670e3d6eb7esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9456 f3b2605a-c512-4ea7… 
Feb 13 2013
5c635d47eb14sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9455 f3b2605a-c512-4ea7… 
Feb 13 2013
ab6e341dd938pscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9454 f3b2605a-c512-4ea7… 
Feb 12 2013
817ed05528edpscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9453 f3b2605a-c512-4ea7… 
Feb 12 2013
9028c18d9740sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9451 f3b2605a-c512-4ea7… 
Feb 12 2013
0f5e42518fd4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9450 f3b2605a-c512-4ea7… 
Feb 12 2013
aae97983b888sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9449 f3b2605a-c512-4ea7… 
Feb 12 2013
0fa04785e3edsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9448 f3b2605a-c512-4ea7… 
Feb 12 2013