3 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
Axel Kohlmeyer	417a56728c	more fixes for C++11 compatibility	2015-06-17 16:40:25 -04:00
Axel Kohlmeyer	0a782cc31d	include faster adapted logarithm	2014-08-08 18:48:47 -04:00