Homec4science
Diffusion lammps e7d896a45938

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
e7d896a45938
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 10 2015, 12:29.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

  1. Resolved Conflicts:
  2. doc/Manual.txt
  3. doc/improper_distance.txt
  4. doc/pair_mdf.txt
  5. python/lammps.py
  6. src/MANYBODY/pair_polymorphic.cpp
  7. src/MANYBODY/pair_polymorphic.h

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Dec 10 2015, 12:29
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPS760071bb4c72: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14342 f3b2605a-c512-4ea7…
rLAMMPS0010e7c7b6d9: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe7d896a45938: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 10 2015, 12:29

Merged Changes

CommitAuthorDetailsCommitted
760071bb4c72sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14342 f3b2605a-c512-4ea7… 
Dec 10 2015
0dcabb70809bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14340 f3b2605a-c512-4ea7… 
Dec 10 2015
fc1a176d0449sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14339 f3b2605a-c512-4ea7… 
Dec 9 2015
93919c35bf48sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14338 f3b2605a-c512-4ea7… 
Dec 9 2015
676cdda5aa39sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14337 f3b2605a-c512-4ea7… 
Dec 9 2015
ab0107595639sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14336 f3b2605a-c512-4ea7… 
Dec 9 2015
704f170053c9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14335 f3b2605a-c512-4ea7… 
Dec 9 2015
82d5d73bbacdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14334 f3b2605a-c512-4ea7… 
Dec 9 2015
83490242654asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14333 f3b2605a-c512-4ea7… 
Dec 9 2015
b1dc50188085sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14332 f3b2605a-c512-4ea7… 
Dec 9 2015
493f9c469b7asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14331 f3b2605a-c512-4ea7… 
Dec 9 2015
87a47d8b9956sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14330 f3b2605a-c512-4ea7… 
Dec 9 2015
c00aabe7364esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14329 f3b2605a-c512-4ea7… 
Dec 9 2015
900a3aaf9d7bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14328 f3b2605a-c512-4ea7… 
Dec 9 2015
6eed163c7b2csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14327 f3b2605a-c512-4ea7… 
Dec 9 2015
e000e4a04f45sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14326 f3b2605a-c512-4ea7… 
Dec 9 2015
582ba55e4a4fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14325 f3b2605a-c512-4ea7… 
Dec 9 2015
7920c13b0436sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14323 f3b2605a-c512-4ea7… 
Dec 9 2015
11fe1e862de6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14322 f3b2605a-c512-4ea7… 
Dec 9 2015
549ea8787b33sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14320 f3b2605a-c512-4ea7… 
Dec 9 2015
90100b4eb02asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14319 f3b2605a-c512-4ea7… 
Dec 9 2015
c2db79391f9csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14318 f3b2605a-c512-4ea7… 
Dec 9 2015
21260340e42bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14317 f3b2605a-c512-4ea7… 
Dec 9 2015
fe6f196439bbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14316 f3b2605a-c512-4ea7… 
Dec 9 2015
d43c4a1bf500sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14315 f3b2605a-c512-4ea7… 
Dec 9 2015
6f443bf17fcbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14314 f3b2605a-c512-4ea7… 
Dec 9 2015
3d659aba57f1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14313 f3b2605a-c512-4ea7… 
Dec 9 2015
bac5a15bfcacsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14312 f3b2605a-c512-4ea7… 
Dec 9 2015
f7355d57615dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14311 f3b2605a-c512-4ea7… 
Dec 9 2015
15c3a778231asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14310 f3b2605a-c512-4ea7… 
Dec 9 2015
c78f2449b2c1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14309 f3b2605a-c512-4ea7… 
Dec 9 2015
a473a42a9c3csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14308 f3b2605a-c512-4ea7… 
Dec 9 2015
1860c2d764a8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14307 f3b2605a-c512-4ea7… 
Dec 9 2015

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.
c4science · Help