Homec4science

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 19 2014, 15:49.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

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

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS91f0acc6ad11: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 19 2014, 15:49

Merged Changes

CommitAuthorDetailsCommitted
2e5648e42c2fAxel Kohlmeyer
include missing timer stamps for MODIFY 
Aug 19 2014
14387fff2731Axel Kohlmeyer
more adjustments to make USER-INTEL compatible with gcc and LAMMPS-ICMS 
Aug 19 2014
bdfd99519dd9Axel Kohlmeyer
use macros for processor specific flags to set alignment or signal no aliasing 
Aug 19 2014
1172085ecd76Axel Kohlmeyer
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms 
Aug 17 2014
6a587c11c669sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12336 f3b2605a-c512-4ea7… 
Aug 15 2014
c2bd9af8797fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12335 f3b2605a-c512-4ea7… 
Aug 15 2014
ef24ec8e56f3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12334 f3b2605a-c512-4ea7… 
Aug 15 2014
e3879a10483bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12332 f3b2605a-c512-4ea7… 
Aug 15 2014
f9814600231dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12331 f3b2605a-c512-4ea7… 
Aug 15 2014
6e622a54af37sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12330 f3b2605a-c512-4ea7… 
Aug 15 2014