Homec4science

Merge branch 'master' into openmp-master

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 27 2011, 12:34.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
src/FLD/pair_lubricate_poly.h
src/USER-OMP/pair_line_lj_omp.h
src/USER-OMP/pair_lubricate_omp.h
src/fix_wall.cpp
src/fix_wall_reflect.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd4e11b033adb: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 27 2011, 12:34

Merged Changes

CommitAuthorDetailsCommitted
e05839cbeba5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7215 f3b2605a-c512-4ea7… 
Oct 26 2011
331aca8ba6bcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7214 f3b2605a-c512-4ea7… 
Oct 26 2011
600c945ee951sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7211 f3b2605a-c512-4ea7… 
Oct 26 2011
3e3dc7361660sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7210 f3b2605a-c512-4ea7… 
Oct 26 2011
c6ab9c0ce614sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7209 f3b2605a-c512-4ea7… 
Oct 26 2011
9e2f81e4ed4asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7208 f3b2605a-c512-4ea7… 
Oct 26 2011
ce48b6d67c3fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7206 f3b2605a-c512-4ea7… 
Oct 26 2011
ac30ed30e3d3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7204 f3b2605a-c512-4ea7… 
Oct 26 2011
cf330851dfc8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7203 f3b2605a-c512-4ea7… 
Oct 26 2011
a0e2e04aed5dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7202 f3b2605a-c512-4ea7… 
Oct 26 2011
c452d0bd8d51sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7201 f3b2605a-c512-4ea7… 
Oct 26 2011