Homec4science
Diffusion lammps 1cdb01dfe3b9

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 10 2013, 14:58.

Description

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

Resolved Conflicts:
lib/atc/Makefile.mingw32-cross
lib/atc/Makefile.mingw32-cross-mpi
lib/atc/Makefile.mingw64-cross
lib/atc/Makefile.mingw64-cross-mpi
lib/atc/Makefile.serial

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Aug 10 2013, 14:58
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPSd56c9dfd2739: Removal of superfluous files from lib-atc repository.
rLAMMPSa849251610d7: fix bug from overeager deletion of unused variables
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1cdb01dfe3b9: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 10 2013, 14:58

Merged Changes

CommitAuthorDetailsCommitted
d56c9dfd2739jzimmer
Removal of superfluous files from lib-atc repository. 
Aug 8 2013
4704ced070e9jzimmer
Updating libatc Makefiles to use only current version *.h and *.cpp files. 
Aug 8 2013

Changes (2)

Path
Plib/atc/Makefile.g++
Copied from lib/atc/Makefile.serial
Plib/atc/Makefile.icc
Copied from lib/atc/Makefile.mpic++

rLAMMPS1cdb01dfe3b9

View Options

lib/atc/Makefile.g++

Loading...
View Options

lib/atc/Makefile.icc

Loading...
c4science · Help