Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 20 2014, 16:51.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS00a18085eb15: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 20 2014, 16:51

Merged Changes

CommitAuthorDetailsCommitted
f51b6d103b77stamoor
Restoring qeq files 
Nov 19 2014
72a1dc1552f1stamoor
Fixing bug in qeq 
Nov 19 2014
7eca5edcae58sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12743 f3b2605a-c512-4ea7… 
Nov 19 2014
2d840c556ba0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12742 f3b2605a-c512-4ea7… 
Nov 19 2014
59c9f7af480csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12741 f3b2605a-c512-4ea7… 
Nov 19 2014
65030577a92fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12740 f3b2605a-c512-4ea7… 
Nov 19 2014
e835f4b6f1c7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12738 f3b2605a-c512-4ea7… 
Nov 19 2014
edb95fc5cd25sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12737 f3b2605a-c512-4ea7… 
Nov 19 2014
b6e72407abc2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12736 f3b2605a-c512-4ea7… 
Nov 19 2014
23a756c86e7esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12735 f3b2605a-c512-4ea7… 
Nov 19 2014
a7c5a1661d25sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12734 f3b2605a-c512-4ea7… 
Nov 19 2014
0617d8704797sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12732 f3b2605a-c512-4ea7… 
Nov 19 2014
526b81b955c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12731 f3b2605a-c512-4ea7… 
Nov 19 2014
aaa76b5649aestamoor
Fixing bug 
Nov 19 2014
74adae232eb4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12729 f3b2605a-c512-4ea7… 
Nov 19 2014
1591ed8379a6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12728 f3b2605a-c512-4ea7… 
Nov 19 2014
fcaaf75764f7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12727 f3b2605a-c512-4ea7… 
Nov 19 2014