Merge branch 'master' into lammps-icms
20d00043b182
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 12 2012, 14:52.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/Makefile
src/output.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 12 2012, 14:52

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS20d00043b182: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 12 2012, 14:52

Commit	Author	Details	Committed
9de3aecca112	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8258 f3b2605a-c512-4ea7…	Jun 12 2012
b1723e171430	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8256 f3b2605a-c512-4ea7…	Jun 11 2012
962180d60969	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8255 f3b2605a-c512-4ea7…	Jun 11 2012
b7eaa9fd138e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8253 f3b2605a-c512-4ea7…	Jun 11 2012
4c827842867b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8252 f3b2605a-c512-4ea7…	Jun 11 2012

				Path
	M			src/Make.sh
	M			src/Makefile
	M			src/output.cpp
	M			src/read_dump.cpp
	M			src/read_dump.h
	V			src/{read_dump_native.cpp → reader_native.cpp}
	V			src/{read_dump_native.h → reader_native.h}
	P			src/reader.cpp Copied from src/USER-OMP/pair_rebo_omp.cpp
	P			src/reader.h Copied from src/USER-MISC/improper_cossq.h
	V			src/{reader_native.cpp ← read_dump_native.cpp}
	V			src/{reader_native.h ← read_dump_native.h}
	M			src/respa.cpp
	M			src/version.h