Commit Graph

12 Commits

Author SHA1 Message Date
1e9a4cc4b8 Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	src/REAX/fix_reax_bonds.cpp
#	src/REAX/fix_reax_bonds.h
#	src/REAX/pair_reax.cpp
#	src/USER-MGPT/pair_mgpt.cpp
#	src/USER-SMTBQ/pair_smtbq.cpp
#	src/lammps.cpp
#	src/timer.cpp
2015-10-31 10:54:08 -04:00
354e20f431 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14220 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2015-10-30 20:04:06 +00:00
8ba4c88c8d initialize variables to silence some distracting warnings 2015-10-28 17:19:38 -04:00
aa33af4032 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10160 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-06-28 19:00:58 +00:00
0e04550043 massive patch to flag non-numeric input 2013-06-23 14:34:38 +02:00
ef9e700545 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-06 22:47:51 +00:00
a10a777640 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7437 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-01-06 17:49:42 +00: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
9600268de9 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4320 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-06-18 19:49:12 +00:00
322ed02798 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3642 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-11 20:25:07 +00:00
e3c029753d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3633 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-08 22:54:13 +00:00
c25bc8174d git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@2892 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2009-06-23 17:14:26 +00:00