8 Commits

Author	SHA1	Message	Date
Axel Kohlmeyer	607c4aa2a3	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms ... # Resolved Conflicts: # doc/Manual.html # doc/Manual.txt # src/USER-SMTBQ/pair_smtbq.cpp	2016-01-12 07:02:29 -05:00
sjplimp	4e199dd5bd	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14424 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2016-01-12 00:12:15 +00:00
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	eb94b9a4ab	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	2015-01-29 07:23:11 -05:00
sjplimp	86daf16069	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12996 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2015-01-28 15:55:56 +00:00
Axel Kohlmeyer	555ef3397d	fix permissions of source files	2013-11-09 14:13:57 +01:00
sjplimp	9f6f931565	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10977 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2013-11-05 17:16:08 +00:00