|
|
f83f55aac1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_temp_csvr.txt
src/fix_temp_csvr.cpp
|
2015-03-28 08:10:26 -04:00 |
|
|
|
77996f48fb
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13327 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-27 20:48:28 +00:00 |
|
|
|
bc06bcf854
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13318 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-27 19:57:11 +00:00 |
|
|
|
fc64a9a443
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13308 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-27 13:59:30 +00:00 |
|
|
|
99d694e5d5
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-26 07:42:03 -04:00 |
|
|
|
226918ea77
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13295 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-25 16:10:54 +00:00 |
|
|
|
05eacff252
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/Make.py
|
2015-03-19 09:13:20 -04:00 |
|
|
|
698e3ac881
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13267 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-18 23:54:11 +00:00 |
|
|
|
54233c58b1
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-18 07:26:15 -04:00 |
|
|
|
782c29a54e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13244 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-17 16:19:04 +00:00 |
|
|
|
220bb4df5e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13237 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-17 16:05:28 +00:00 |
|
|
|
34976350ee
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/Makefile
|
2015-03-12 17:48:01 -04:00 |
|
|
|
3a259ca9c3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13228 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-11 15:42:28 +00:00 |
|
|
|
29cf7eb607
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13224 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-11 15:33:00 +00:00 |
|
|
|
d6d368f447
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-07 14:41:45 +01:00 |
|
|
|
08e77a79b3
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13205 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-06 16:26:39 +00:00 |
|
|
|
a4f7f9c868
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-03-05 08:05:18 -05:00 |
|
|
|
b66b3f774a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13188 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-04 22:31:06 +00:00 |
|
|
|
6960d97425
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13178 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-03-04 21:51:44 +00:00 |
|
|
|
09bb220083
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-25 17:03:53 -05:00 |
|
|
|
50dcfc4bad
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13158 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-24 16:46:30 +00:00 |
|
|
|
7af1fc13f8
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/QEQ/fix_qeq.cpp
|
2015-02-20 08:09:55 -05:00 |
|
|
|
9db7e6449f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13143 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-20 00:08:36 +00:00 |
|
|
|
c3e258814f
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-17 10:52:19 -05:00 |
|
|
|
b142613a0e
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13122 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-16 17:58:03 +00:00 |
|
|
|
dfa37115f0
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_howto.txt
|
2015-02-14 16:16:30 -05:00 |
|
|
|
20032cd0a7
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13113 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-13 22:15:20 +00:00 |
|
|
|
195cbef33a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13109 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-13 20:31:47 +00:00 |
|
|
|
ced4019b12
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-12 07:44:59 -05:00 |
|
|
|
fc68de73c8
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13095 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-12 00:26:44 +00:00 |
|
|
|
d3a1cb6675
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-09 12:05:50 -05:00 |
|
|
|
36421c5c12
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13080 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-07 00:26:42 +00:00 |
|
|
|
4fdb97ee48
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-02-05 10:36:13 -05:00 |
|
|
|
6c48e6f6d5
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13062 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 22:23:48 +00:00 |
|
|
|
dee608a73a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13051 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 21:27:11 +00:00 |
|
|
|
6140416eba
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13043 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 21:08:58 +00:00 |
|
|
|
a695874c7f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13032 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-02-04 18:13:25 +00:00 |
|
|
|
c3cb0e9124
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-FEP/pair_lj_cut_coul_cut_soft.cpp
src/USER-FEP/pair_lj_cut_coul_long_soft.cpp
src/USER-FEP/pair_lj_cut_soft.cpp
|
2015-02-02 15:23:42 -05:00 |
|
|
|
d98318fd76
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13015 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-30 22:25:47 +00:00 |
|
|
|
ac19c2ea2e
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-CUDA/pppm_cuda.cpp
|
2015-01-21 11:14:31 -05:00 |
|
|
|
5b0ba7980c
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12982 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-20 23:48:30 +00:00 |
|
|
|
8d532d93e9
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_adapt.txt
doc/fix_adapt_fep.txt
|
2015-01-20 07:09:33 -05:00 |
|
|
|
38664b904f
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12959 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-19 23:54:49 +00:00 |
|
|
|
a080316187
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12953 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-19 22:27:57 +00:00 |
|
|
|
fc6be0ef34
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-OMP/fix_rigid_nh_omp.cpp
|
2015-01-12 10:02:37 -05:00 |
|
|
|
af8e1ea843
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12931 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-10 00:18:07 +00:00 |
|
|
|
97f296304d
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12926 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-09 17:16:14 +00:00 |
|
|
|
eea5a1692d
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
|
2015-01-08 06:40:31 -05:00 |
|
|
|
22bfbbda3a
|
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12889 f3b2605a-c512-4ea7-a41b-209d697bcdaa
|
2015-01-06 21:10:16 +00:00 |
|
|
|
5838c3c542
|
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/RIGID/fix_rigid.cpp
|
2015-01-06 09:26:22 -05:00 |
|
