Homec4science

Merge branch 'master' into openmp-master

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 2 2011, 17:52.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
doc/Section_commands.txt
doc/Section_packages.txt
doc/Section_start.txt
doc/angle_sdk.html
doc/package.txt
doc/pair_coul_diel.txt
doc/pair_gauss.txt
doc/pair_sdk.html
doc/suffix.txt
src/GPU/pppm_gpu.cpp
src/PERI/fix_peri_neigh.h
src/USER-CG-CMM/README
src/USER-OMP/fix_peri_neigh_omp.h
src/input.cpp
src/min.cpp
src/verlet.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS9d162cd555bd: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 2 2011, 17:52

Merged Changes

CommitAuthorDetailsCommitted
5a968ac62e01sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7272 f3b2605a-c512-4ea7… 
Dec 1 2011
a6d0ca14cf51sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7270 f3b2605a-c512-4ea7… 
Dec 1 2011
2ff6b10ce218sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7269 f3b2605a-c512-4ea7… 
Dec 1 2011
dac5c0354dfasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7268 f3b2605a-c512-4ea7… 
Dec 1 2011
4643566b2519sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7267 f3b2605a-c512-4ea7… 
Dec 1 2011
8c372f6c410dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7266 f3b2605a-c512-4ea7… 
Dec 1 2011
57a20c2706cesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7265 f3b2605a-c512-4ea7… 
Dec 1 2011
389584998643sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7264 f3b2605a-c512-4ea7… 
Dec 1 2011
b3cd459ea9fbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7263 f3b2605a-c512-4ea7… 
Dec 1 2011
ba728e5e07e1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7262 f3b2605a-c512-4ea7… 
Dec 1 2011
8f728e4823aasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7261 f3b2605a-c512-4ea7… 
Dec 1 2011
ade9c93d8bebsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7260 f3b2605a-c512-4ea7… 
Dec 1 2011
d966083a3f0fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7259 f3b2605a-c512-4ea7… 
Dec 1 2011
596bff6b8737sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7258 f3b2605a-c512-4ea7… 
Dec 1 2011
750c4b07bbdesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7257 f3b2605a-c512-4ea7… 
Dec 1 2011
70a85bddfd2dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7256 f3b2605a-c512-4ea7… 
Dec 1 2011
d96b0ab866aesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7255 f3b2605a-c512-4ea7… 
Dec 1 2011
0dacc993ae27sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7254 f3b2605a-c512-4ea7… 
Dec 1 2011
e2d5ab683f49sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7253 f3b2605a-c512-4ea7… 
Dec 1 2011
badb8c439d8dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7252 f3b2605a-c512-4ea7… 
Dec 1 2011
b7f57f079dfdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7251 f3b2605a-c512-4ea7… 
Dec 1 2011