Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Browse Source

Resolved Conflicts:
	doc/Manual.txt
	src/MAKE/Makefile.openmpi
	src/MANYBODY/fix_qeq_comb.cpp
	src/MANYBODY/pair_nb3b_harmonic.cpp
	src/RIGID/fix_rigid_small.cpp
	src/RIGID/fix_shake.cpp
	src/USER-REAXC/fix_qeq_reax.cpp
	src/USER-REAXC/fix_reaxc_bonds.cpp
	src/read_data.cpp
	src/special.h

...

This commit is contained in:

Axel Kohlmeyer

2014-01-18 11:52:59 -05:00

parent 38ac088929 687616b204

commit 46e8e6c120

198 changed files with 2854 additions and 2363 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1424

src/read_data.cpp

File diff suppressed because it is too large Load Diff