|
|
247e55937a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
|
2016-04-08 06:24:09 -04:00 |
|
|
|
6a1e85d32a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14812 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-04-07 21:16:06 +00:00 |
|
|
|
d8a711e50e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14810 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-04-07 21:13:52 +00:00 |
|
|
|
b3d2b951f5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/pair_reax.html
|
2016-03-29 07:00:12 -04:00 |
|
|
|
1103448232
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14788 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-28 14:23:28 +00:00 |
|
|
|
8c56f954bc
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# src/USER-INTEL/verlet_intel.cpp
# src/domain.cpp
|
2016-03-22 06:26:33 -04:00 |
|
|
|
847090cd89
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14759 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-21 16:14:31 +00:00 |
|
|
|
cea9e516a8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14757 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-21 16:06:09 +00:00 |
|
|
|
c874ec86df
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
|
2016-03-15 06:33:59 -04:00 |
|
|
|
93e451b594
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14748 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 19:06:38 +00:00 |
|
|
|
92ef1cb060
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14743 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 18:44:13 +00:00 |
|
|
|
66b282b36d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14741 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-14 18:41:39 +00:00 |
|
|
|
6e327ee1b3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
# doc/Eqs/pair_morse_smooth_linear.jpg
# doc/Manual.html
# doc/Manual.txt
# doc/pair_morse.txt
|
2016-03-02 17:38:06 -05:00 |
|
|
|
c67331a3bc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14711 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-03-01 22:30:28 +00:00 |
|
|
|
dee858771a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
|
2016-02-23 08:47:52 -05:00 |
|
|
|
f406a5ed55
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14663 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-22 23:00:59 +00:00 |
|
|
|
685ae65b02
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/JPG/improper_distance.jpg
doc/Section_packages.txt
|
2016-02-17 13:14:45 +01:00 |
|
|
|
f5e8f73677
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14645 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-16 15:05:17 +00:00 |
|
|
|
1d9d6f9241
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Eqs/improper_dist-1.jpg
doc/Eqs/pair_mdf-1.jpg
doc/Eqs/pair_mdf-2.jpg
doc/Eqs/pair_mdf-3.jpg
doc/Eqs/pair_mdf-4.jpg
doc/Eqs/pair_mdf-5.jpg
doc/Eqs/pair_mdf-6.jpg
doc/Manual.html
doc/Manual.txt
doc/Section_commands.txt
doc/dump_custom_vtk.txt
doc/fix.txt
lib/vtk/Makefile.lammps
python/lammps.py
src/Makefile
src/USER-COLVARS/ndx_group.cpp
src/USER-VTK/dump_custom_vtk.h
|
2016-02-16 12:44:25 +01:00 |
|
|
|
ae788f1bdc
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14635 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-15 22:47:22 +00:00 |
|
|
|
952671afd6
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14629 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-15 22:27:20 +00:00 |
|
|
|
53f0833088
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14599 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-15 15:49:59 +00:00 |
|
|
|
e98647efb2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14597 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-15 15:36:35 +00:00 |
|
|
|
729ba2cc21
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14590 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-15 15:28:30 +00:00 |
|
|
|
15822b0927
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2016-02-04 14:11:07 +01:00 |
|
|
|
0963784ff1
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14538 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-02-03 21:22:35 +00:00 |
|
|
|
6303826d29
|
Merge remote branch 'lammps-ro/master' into lammps-icms
|
2016-01-29 13:59:06 +01:00 |
|
|
|
997ce626ac
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14512 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-28 21:20:27 +00:00 |
|
|
|
b9913826d9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/fix_nh.txt
# src/create_atoms.cpp
|
2016-01-16 08:09:15 -05:00 |
|
|
|
ef6beaad54
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14447 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-15 15:32:31 +00:00 |
|
|
|
5e8d04a07f
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
|
2015-12-24 07:44:16 -05:00 |
|
|
|
57dc7d32d4
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14399 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-23 17:07:47 +00:00 |
|
|
|
490401bd6a
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/pair_reax.html
|
2015-12-20 20:06:45 -05:00 |
|
|
|
e2ec56c171
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14391 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-19 18:42:24 +00:00 |
|
|
|
5affb6c013
|
Merge branch 'master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/pair_hybrid.txt
# doc/pair_reax.html
# doc/pair_reax.txt
# doc/pair_reax_c.txt
# src/MANYBODY/pair_polymorphic.cpp
|
2015-12-11 07:33:14 -05:00 |
|
|
|
28bf73fbf7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14349 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:23:56 +00:00 |
|
|
|
e7d896a459
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/improper_distance.txt
# doc/pair_mdf.txt
# python/lammps.py
# src/MANYBODY/pair_polymorphic.cpp
# src/MANYBODY/pair_polymorphic.h
|
2015-12-10 06:29:32 -05:00 |
|
|
|
fc1a176d04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14339 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:46:13 +00:00 |
|
|
|
676cdda5aa
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14337 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 22:32:13 +00:00 |
|
|
|
25432292fb
|
merge of remaining commits from upstream
# Conflicts:
# doc/searchindex.js
|
2015-11-19 08:30:03 -05:00 |
|
|
|
e3c4db746c
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14263 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-11-17 23:13:55 +00:00 |
|
|
|
16a90f2bfc
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14256 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-11-17 21:42:53 +00:00 |
|
|
|
9bbfe36cb7
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Conflicts:
# doc/Manual.txt
|
2015-11-08 18:06:37 -05:00 |
|
|
|
007123f198
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14240 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-11-06 15:51:47 +00:00 |
|
|
|
07554c8efe
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# lib/colvars/colvarmodule.h
# src/Makefile
# src/min_cg.cpp
# src/min_fire.cpp
# src/min_quickmin.cpp
# src/min_sd.cpp
# src/respa.cpp
# src/version.h
|
2015-10-23 07:08:37 -04:00 |
|
|
|
0a19b07d8e
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14184 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 00:23:13 +00:00 |
|
|
|
823cc16bdf
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# doc/Section_start.txt
# doc/pair_hybrid.txt
# doc/pair_reax.html
# src/CORESHELL/pair_lj_cut_coul_long_cs.cpp
# src/KSPACE/pair_lj_cut_coul_long.cpp
# src/KSPACE/pair_lj_cut_coul_msm.cpp
# src/MC/fix_bond_break.cpp
# src/MC/fix_bond_break.h
# src/MC/fix_bond_create.cpp
# src/MC/fix_bond_create.h
# src/USER-FEP/pair_lj_cut_soft.cpp
# src/USER-MISC/README
# src/USER-MISC/fix_ti_spring.cpp
# src/output.cpp
|
2015-10-22 08:17:31 -04:00 |
|
|
|
cb6baee0b1
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14137 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-21 19:30:46 +00:00 |
|
|
|
cd078405e0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14131 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-21 18:52:59 +00:00 |
|
|
|
c6e41c4a32
|
remove REAX package and references to it in the documentation
|
2015-10-20 14:37:28 -04:00 |
|
