Axel Kohlmeyer ce2b853e4a Merge remote branch 'lammps-ro/master' into lammps-icms ...

Resolved Conflicts:
	doc/Eqs/pair_gauss.jpg
	doc/Manual.txt
	doc/pair_list.html
	doc/pair_list.txt
	lib/atc/Makefile.lammps.linalg
	lib/awpmd/Makefile.lammps.linalg
	lib/gpu/Makefile.lincoln
	lib/linalg/Makefile.gfortran
	lib/linalg/Makefile.mingw_cross
	lib/linalg/README
	lib/reax/Makefile.lammps
	src/USER-CG-CMM/Install.sh
	src/USER-COLVARS/Install.sh
	src/USER-CUDA/Install.sh
	src/USER-MISC/Install.sh
	src/USER-MISC/pair_list.cpp
	src/USER-OMP/Install.sh
	src/USER-PHONON/Install.sh

2013-06-01 13:53:34 +02:00

..

Install.sh

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9987 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-05-31 15:17:46 +00:00

pair_eam_alloy_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_eam_alloy_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_eam_fs_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_eam_fs_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_eam_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8798 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-09-18 23:36:03 +00:00

pair_eam_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_charmm_coul_long_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_lj_charmm_coul_long_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_cut_coul_long_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_lj_cut_coul_long_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_cut_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_lj_cut_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00

pair_lj_cut_tip4p_long_opt.cpp

some cleanups and minor optimizations

2013-02-13 08:45:07 +01:00

pair_lj_cut_tip4p_long_opt.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8890 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-10-03 15:13:31 +00:00

pair_lj_long_coul_long_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9701 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-21 17:36:09 +00:00

pair_lj_long_coul_long_opt.h

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9588 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-03-06 17:17:34 +00:00

pair_morse_opt.cpp

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-06-06 22:47:51 +00:00

pair_morse_opt.h

Merge branch 'master' into lammps-icms

2012-06-07 16:42:38 -04:00