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
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Oct 27 2011, 12:34 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS48ebc33f7139: more files to ignore
rLAMMPSe05839cbeba5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7215 f3b2605a-c512-4ea7… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| e05839cbeba5 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7215 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| 331aca8ba6bc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7214 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| 600c945ee951 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7211 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| 3e3dc7361660 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7210 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| c6ab9c0ce614 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7209 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| 9e2f81e4ed4a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7208 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| ce48b6d67c3f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7206 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| ac30ed30e3d3 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7204 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| cf330851dfc8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7203 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| a0e2e04aed5d | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7202 f3b2605a-c512-4ea7… | Oct 26 2011 | |||
| c452d0bd8d51 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7201 f3b2605a-c512-4ea7… | Oct 26 2011 |
