Merge branch 'master' into lammps-icms
8d906fc56660
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 31 2010, 15:34.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 31 2010, 15:34

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8d906fc56660: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 31 2010, 15:34

Commit	Author	Details	Committed
5ae1689c9bf0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4630 f3b2605a-c512-4ea7…	Aug 30 2010
2411d53ffe34	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4629 f3b2605a-c512-4ea7…	Aug 30 2010
42c067817726	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4628 f3b2605a-c512-4ea7…	Aug 30 2010
009e6201de6a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4627 f3b2605a-c512-4ea7…	Aug 30 2010
b019664c867e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4626 f3b2605a-c512-4ea7…	Aug 30 2010
0f91a3b37286	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4625 f3b2605a-c512-4ea7…	Aug 30 2010
352e1934908d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4624 f3b2605a-c512-4ea7…	Aug 30 2010
50795135ec80	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4622 f3b2605a-c512-4ea7…	Aug 30 2010
7702ca9d35f4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4621 f3b2605a-c512-4ea7…	Aug 30 2010
1bf271cfd300	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4620 f3b2605a-c512-4ea7…	Aug 30 2010
591478d58d52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4616 f3b2605a-c512-4ea7…	Aug 30 2010
4d52dc0c953f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4615 f3b2605a-c512-4ea7…	Aug 30 2010
e159d4ebbb9d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4614 f3b2605a-c512-4ea7…	Aug 30 2010

				Path
	A			doc/Eqs/pair_comb1.jpg
	A			doc/Eqs/pair_comb1.tex
	A			doc/Eqs/pair_comb2.jpg
	A			doc/Eqs/pair_comb2.tex
	D			doc/Eqs/pair_comb_1.jpg
	D			doc/Eqs/pair_comb_2.jpg
	M			doc/compute_heat_flux.html
	M			doc/compute_heat_flux.txt
	M			doc/pair_comb.html
	M			doc/pair_comb.txt
	M			examples/comb/README.txt
	M			examples/comb/data.c-HfO2
	M			examples/comb/data.m-HfO2
	M			examples/comb/data.t-HfO2
	M			examples/comb/ffield.comb
	M			examples/comb/in.comb.Cu2O.elastic
	M			examples/comb/in.comb.HfO2
	M			examples/comb/log.comb.Cu.15Jan10.linux.1
	M			examples/comb/log.comb.Cu.15Jan10.linux.4
	A			examples/comb/log.comb.Cu2O.elastic.15Jan10.linux.1
	A			examples/comb/log.comb.Cu2O.elastic.15Jan10.linux.4
	D			examples/comb/log.comb.Cu2O.elastic.linux.1
	D			examples/comb/log.comb.Cu2O.elastic.linux.4
	M			examples/comb/log.comb.HfO2.15Jan10.linux.1
	M			examples/comb/log.comb.HfO2.15Jan10.linux.4
	M			examples/comb/log.comb.Si.15Jan10.linux.1
	M			examples/comb/log.comb.Si.15Jan10.linux.4
	M			examples/comb/log.comb.Si.elastic.15Jan10.linux.1
	M			examples/comb/log.comb.Si.elastic.15Jan10.linux.4
	M			lib/meam/meam_setup_done.F
	M			src/MAKE/Makefile.redsky
	M			src/fix_indent.cpp
	M			src/version.h