Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 15 2015, 12:51.

Description

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

  1. Conflicts:
  2. doc/Manual.html
  3. doc/Manual.txt
  4. lib/kokkos/Makefile.lammps

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0d27fd720de5: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 15 2015, 12:51

Merged Changes

CommitAuthorDetailsCommitted
f393d0160a66stamoor
Slight tweaks to Kokkos Makefiles 
Jul 14 2015
74aa4926d965sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13588 f3b2605a-c512-4ea7… 
Jul 14 2015
e60fcd98f503sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13587 f3b2605a-c512-4ea7… 
Jul 14 2015
fb119579ef6fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13586 f3b2605a-c512-4ea7… 
Jul 14 2015
639c39f38a15sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13585 f3b2605a-c512-4ea7… 
Jul 14 2015
7c2f518e8d0dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13584 f3b2605a-c512-4ea7… 
Jul 14 2015
61ec2f78acb5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13583 f3b2605a-c512-4ea7… 
Jul 14 2015
47e13d72a8dcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13582 f3b2605a-c512-4ea7… 
Jul 14 2015
26b23a47cd8asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13581 f3b2605a-c512-4ea7… 
Jul 14 2015
ca4fa347b359sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13579 f3b2605a-c512-4ea7… 
Jul 14 2015
4e6e4da3833csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13578 f3b2605a-c512-4ea7… 
Jul 14 2015
64e0dec066besjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13576 f3b2605a-c512-4ea7… 
Jul 14 2015
dd450680a851sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13575 f3b2605a-c512-4ea7… 
Jul 14 2015
ba5cad5641c2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13574 f3b2605a-c512-4ea7… 
Jul 14 2015
233c6521dc3asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13573 f3b2605a-c512-4ea7… 
Jul 14 2015
476ff262c754sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13572 f3b2605a-c512-4ea7… 
Jul 14 2015