|
|
a066cbb210
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
|
2016-01-15 08:18:31 -05:00 |
|
|
|
ba87515112
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14444 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-15 00:35:21 +00:00 |
|
|
|
4be9cd4bee
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
|
2016-01-13 06:17:50 -05:00 |
|
|
|
cd1f4ae7f0
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14438 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-12 22:29:26 +00:00 |
|
|
|
a34b9f17da
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14433 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-12 16:48:49 +00:00 |
|
|
|
607c4aa2a3
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/USER-SMTBQ/pair_smtbq.cpp
|
2016-01-12 07:02:29 -05:00 |
|
|
|
9e4140c954
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14413 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2016-01-11 18:57:20 +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 |
|
|
|
06e04df4e3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14406 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-24 00:03:25 +00:00 |
|
|
|
ce72ce4e13
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14404 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-24 00:00:27 +00:00 |
|
|
|
81f9f74d8e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/pair_reax.html
|
2015-12-22 07:49:35 -05:00 |
|
|
|
6f10e999c9
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14394 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-21 15:20:41 +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 |
|
|
|
1aeecfb0cf
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.txt
# doc/pair_reax.html
# src/USER-PHONON/fix_phonon.cpp
|
2015-12-16 07:31:09 -05:00 |
|
|
|
f3af23a41b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14375 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-15 23:31:16 +00:00 |
|
|
|
75de12f26a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14365 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-15 15:49:29 +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 |
|
|
|
3b6a3f4e55
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 22:38:44 +00:00 |
|
|
|
4c1ad17581
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14354 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-10 17:44:45 +00: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 |
|
|
|
c00aabe736
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14329 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 21:24:31 +00:00 |
|
|
|
7920c13b04
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14323 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 18:17:05 +00:00 |
|
|
|
549ea8787b
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14320 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-09 17:45:54 +00:00 |
|
|
|
0010e7c7b6
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
# Resolved Conflicts:
# doc/Manual.html
# doc/Manual.txt
# src/STUBS/Makefile
|
2015-12-09 08:55:51 -05:00 |
|
|
|
f3dabd0dce
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14304 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-08 23:56:27 +00:00 |
|
|
|
ab3fa39cc2
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14302 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-08 23:52:11 +00:00 |
|
|
|
9f7fc76984
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14297 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-08 23:35:16 +00:00 |
|
|
|
eaa45f0b10
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14295 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-08 23:34:01 +00:00 |
|
|
|
b73bfe968a
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14293 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-12-08 23:16:00 +00:00 |
|
|
|
44b542c0f7
|
restore some LAMMPS-ICMS "branding"
|
2015-11-21 07:11:12 -05:00 |
|
|
|
574a328184
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14272 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-11-21 00:35:34 +00: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 |
|
|
|
d7e2bb3a62
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14259 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-11-17 21:43:53 +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 |
|
|
|
048f290a7d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14246 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-11-07 21:07:09 +00: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 |
|
|
|
c8c2f18edd
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14228 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-30 23:45:52 +00:00 |
|
|
|
b4ff47495c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14222 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-30 20:14:57 +00:00 |
|
|
|
99dcf3ce7d
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14211 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 19:50:02 +00:00 |
|
|
|
7340e1b429
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14208 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 19:46:53 +00:00 |
|
|
|
a27957c58f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14201 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 17:16:34 +00:00 |
|
|
|
f04945de32
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14199 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 17:14:26 +00:00 |
|
|
|
7a9ae37e02
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14192 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 00:46:13 +00:00 |
|
|
|
58c70ec9e4
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14186 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-23 00:30:38 +00:00 |
|
|
|
b72306641c
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14179 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-22 23:53:49 +00:00 |
|
|
|
01acc93029
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14170 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-22 22:17:18 +00:00 |
|
|
|
36b3880e39
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14167 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-22 22:09:44 +00:00 |
|
|
|
d75b4730d9
|
''
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14160 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-10-21 23:17:48 +00:00 |
|
