Homec4science

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro

Authored by Mike Brown <wb8@lens-login1.ccs.ornl.gov> on May 3 2011, 22:03.

Description

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro

Conflicts:
doc/Section_intro.txt
doc/Section_start.txt
src/GPU/Install.sh
src/GPU/fix_gpu.cpp

Event Timeline

Mike Brown <wb8@lens-login1.ccs.ornl.gov> committed rLAMMPSafa3eeac0b21: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@lens-login1.ccs.ornl.gov>).May 3 2011, 22:03

Merged Changes

CommitAuthorDetailsCommitted
0add57d01eefsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6058 f3b2605a-c512-4ea7… 
May 2 2011
5f4a69b0b01bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6056 f3b2605a-c512-4ea7… 
May 2 2011
96fb599b2d3dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6055 f3b2605a-c512-4ea7… 
May 2 2011
6321bca76958sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6054 f3b2605a-c512-4ea7… 
May 2 2011
5f799182b382sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6053 f3b2605a-c512-4ea7… 
May 2 2011
2be078632da8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6052 f3b2605a-c512-4ea7… 
May 2 2011
f6151f67354dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6051 f3b2605a-c512-4ea7… 
May 2 2011
1773dd293f39athomps
reverted accidental change 
Apr 30 2011
fb012a60aff3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6046 f3b2605a-c512-4ea7… 
Apr 30 2011
18b365794d33athomps
Added xsu, ysu, zsu to dump custom and dump cfg 
Apr 30 2011
7c04f95ce0f7athomps
Added xsu, ysu, zsu to dump custom and dump cfg 
Apr 30 2011
21de80701082athomps
Added xsu, ysu, zsu to dump custom and dump cfg 
Apr 30 2011
ee769613d766sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6041 f3b2605a-c512-4ea7… 
Apr 29 2011
3b3c1d118dfesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6040 f3b2605a-c512-4ea7… 
Apr 29 2011
f702d5c26a92sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6036 f3b2605a-c512-4ea7… 
Apr 29 2011
a990ae69be42sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6035 f3b2605a-c512-4ea7… 
Apr 29 2011
72644dcb8d26sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6034 f3b2605a-c512-4ea7… 
Apr 29 2011
199c005d935esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6033 f3b2605a-c512-4ea7… 
Apr 29 2011
995a92b9f3efsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6030 f3b2605a-c512-4ea7… 
Apr 28 2011
bce11d1402absjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6029 f3b2605a-c512-4ea7… 
Apr 28 2011
e2707ca96f37sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6026 f3b2605a-c512-4ea7… 
Apr 28 2011