Commit Graph

12 Commits

Author SHA1 Message Date
75b1670c51 Merge branch 'master' into openmp-master 2011-11-01 19:33:41 -04:00
f0e2a07be3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7220 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-10-31 14:22:15 +00:00
78b0055319 Merge branch 'ak-fix' into openmp-step2
Resolved Conflicts:
	src/COLLOID/pair_colloid.cpp
	src/pair_table.cpp
2011-09-24 13:55:42 -04:00
19e8c92a90 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-09-23 18:06:55 +00:00
488eca7165 implemented improved timer class 2011-08-26 18:39:14 -04:00
7e5eb0132b Added missing call to min_clearstore
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5397 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-12-14 22:35:10 +00:00
7e51f7cb0c git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4888 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-09-29 23:38:32 +00:00
a5f54fa1e2 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4589 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-08-25 17:03:55 +00:00
5450680d03 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4547 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-08-20 20:43:41 +00:00
b3132ab259 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4220 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-06-02 15:41:31 +00:00
7a5cf1480a git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4188 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-05-21 20:05:47 +00:00
d3302c4cee git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3199 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-09-29 14:10:33 +00:00