4 Commits

Author	SHA1	Message	Date
Axel Kohlmeyer	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
sjplimp	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
Axel Kohlmeyer	3bbba19e85	correct bug in cleanup script and update permissions accordingly	2015-10-27 07:07:38 -04:00
sjplimp	fe59993ac8	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13260 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2015-03-18 23:37:17 +00:00