Merge branch 'openmp-master' into openmp-step2
Resolved Conflicts:
src/USER-OMP/Install.sh
src/finish.cpp
src/min.cpp
src/respa.cpp
src/verlet.cpp
Merge branch 'openmp-master' into openmp-step2
Resolved Conflicts:
src/USER-OMP/Install.sh
src/finish.cpp
src/min.cpp
src/respa.cpp
src/verlet.cpp
Axel Kohlmeyer <akohlmey@gmail.com> | Aug 26 2011, 15:51 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
446ae7be8b7c | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Aug 26 2011 | |||
4857ac3b20ca | athomps | Fixed error in lj/gromacs | Aug 26 2011 | |||
7d8585160725 | athomps | Fixed error in lj/gromacs | Aug 26 2011 | |||
d0efe70181e1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6817 f3b2605a-c512-4ea7… | Aug 26 2011 | |||
1d743442b34c | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6816 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
62126a8f6d7f | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6814 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
61387a32b204 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6813 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
ae65078601fd | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6810 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
a8cf1de735d0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6809 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
a3add0b021f8 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6808 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
d0d785e3a2c9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6807 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
b5a3443db744 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6803 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
499db7f9cd85 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6801 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
8f75fcbb8b82 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6800 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
19399847e3e0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6799 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
e4b59d189f59 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6798 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
58b907b506f0 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6797 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
3a9ba7dd2837 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6796 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
9eb5aebed977 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6795 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
b19a38a92d19 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6794 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
eb915e1174df | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6792 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
158388f66cd7 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6790 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
0cc0882f08bc | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6789 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
786bcba08180 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6786 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
7ea8d72b4fc1 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6785 f3b2605a-c512-4ea7… | Aug 25 2011 | |||
ff6a98efa053 | Axel Kohlmeyer | Merge branch 'master' into openmp-master | Aug 25 2011 |