Homec4science

Merge remote-tracking branch 'lammps-ro/master' into atc-merge

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

Description

Merge remote-tracking branch 'lammps-ro/master' into atc-merge

Resolved Conflicts:
doc/Manual.txt
src/USER-ATC/Install.sh
tools/msi2lmp/biosym_frc_files/README

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc931a450c093: Merge remote-tracking branch 'lammps-ro/master' into atc-merge (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 8 2013, 14:02

Merged Changes

CommitAuthorDetailsCommitted
0ec1c854eb38rjones
ATC version 2.0, date: Aug7 
Aug 7 2013
2629a8389daerjones
ATC version 2.0, date: Aug7 
Aug 7 2013
7855ef6ddac4rjones
ATC version 2.0, date: Aug7 
Aug 7 2013
fafff431e931rjones
ATC version 2.0, date: Aug7 
Aug 7 2013
53c7162e9eb1rjones
ATC version 2.0, date: Aug7 
Aug 7 2013
666de878addcrjones
ATC version 2.0, date: Aug7 
Aug 7 2013
0e4d1e6b2274rjones
ATC version 2.0, date: Aug7 
Aug 7 2013
6d40d7c25d58rjones
ATC version 2.0, date: Aug7 
Aug 7 2013
2486323112f2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10554 f3b2605a-c512-4ea7… 
Aug 6 2013
0239cf54addcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10553 f3b2605a-c512-4ea7… 
Aug 6 2013
20d39d1e8d70sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10552 f3b2605a-c512-4ea7… 
Aug 6 2013
1701830c12a0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10551 f3b2605a-c512-4ea7… 
Aug 6 2013
aff25bf5865asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10550 f3b2605a-c512-4ea7… 
Aug 6 2013
79a2a93f9cd9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10549 f3b2605a-c512-4ea7… 
Aug 6 2013
afef1c881485sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10548 f3b2605a-c512-4ea7… 
Aug 6 2013
6420945660e7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10535 f3b2605a-c512-4ea7… 
Aug 5 2013
ebe6ead34839sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10534 f3b2605a-c512-4ea7… 
Aug 5 2013