Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 25 2014, 21:01.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_intro.txt
doc/fix_gle.txt
doc/fix_ipi.txt
examples/USER/i-pi/README
src/USER-MISC/README
src/USER-MISC/fix_gle.cpp
src/USER-MISC/fix_ipi.cpp
src/USER-MISC/fix_ipi.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS475aa20270a7: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 25 2014, 21:01

Merged Changes

CommitAuthorDetailsCommitted
c8207561695dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12794 f3b2605a-c512-4ea7… 
Nov 25 2014
763bc780ab10sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12793 f3b2605a-c512-4ea7… 
Nov 25 2014
fe42affff424sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12792 f3b2605a-c512-4ea7… 
Nov 24 2014
6af8a5617510sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12790 f3b2605a-c512-4ea7… 
Nov 24 2014
12d4502b639dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12789 f3b2605a-c512-4ea7… 
Nov 24 2014
1f84af1b9165sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12788 f3b2605a-c512-4ea7… 
Nov 24 2014
0e4d24ade8basjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12787 f3b2605a-c512-4ea7… 
Nov 24 2014
6f94c97e48a2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12786 f3b2605a-c512-4ea7… 
Nov 24 2014
6641435368a4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12785 f3b2605a-c512-4ea7… 
Nov 24 2014
223eea151072sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12784 f3b2605a-c512-4ea7… 
Nov 24 2014
8c274c9af232sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12783 f3b2605a-c512-4ea7… 
Nov 24 2014
2bd1303e7529sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12781 f3b2605a-c512-4ea7… 
Nov 24 2014
5f9a74958266sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12780 f3b2605a-c512-4ea7… 
Nov 24 2014
6ee2f9f3e394sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12779 f3b2605a-c512-4ea7… 
Nov 24 2014
f71c10b8c9c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12778 f3b2605a-c512-4ea7… 
Nov 24 2014
9f78ad596a31sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12776 f3b2605a-c512-4ea7… 
Nov 24 2014
11bd1a45ed40sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12775 f3b2605a-c512-4ea7… 
Nov 24 2014
53c71398d168sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12774 f3b2605a-c512-4ea7… 
Nov 24 2014
162e8050ad6bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12773 f3b2605a-c512-4ea7… 
Nov 24 2014
a52ad2d6dda1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12772 f3b2605a-c512-4ea7… 
Nov 24 2014
b2e008ee04e4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12771 f3b2605a-c512-4ea7… 
Nov 24 2014
432ed7a9f8e9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12770 f3b2605a-c512-4ea7… 
Nov 24 2014
997f7a8845a2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12769 f3b2605a-c512-4ea7… 
Nov 24 2014