Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 5 2013, 13:37.

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/Section_commands.txt
doc/Section_start.txt
doc/dump_image.txt
doc/dump_modify.txt
doc/write_dump.txt
src/USER-PHONON/fix_phonon.cpp
src/dump_movie.cpp
src/write_dump.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdc1278ee51e6: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 5 2013, 13:37

Merged Changes

CommitAuthorDetailsCommitted
661c056cdb2esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10965 f3b2605a-c512-4ea7… 
Nov 4 2013
8777a53f1a60sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10963 f3b2605a-c512-4ea7… 
Nov 4 2013
83d209b7f89bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10962 f3b2605a-c512-4ea7… 
Nov 4 2013
ff824424cbbbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10960 f3b2605a-c512-4ea7… 
Nov 4 2013
83c5f05e64b5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10959 f3b2605a-c512-4ea7… 
Nov 4 2013
0d9e811cbb87sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10958 f3b2605a-c512-4ea7… 
Nov 4 2013
b0064e507cdfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10957 f3b2605a-c512-4ea7… 
Nov 4 2013
90a2bccf8379sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10956 f3b2605a-c512-4ea7… 
Nov 4 2013
fb24b5ad83besjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10955 f3b2605a-c512-4ea7… 
Nov 4 2013
315cc6011e70sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10954 f3b2605a-c512-4ea7… 
Nov 4 2013
343928a9f1fdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10953 f3b2605a-c512-4ea7… 
Nov 4 2013
a3c23107159asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10950 f3b2605a-c512-4ea7… 
Nov 4 2013
63b1d81230ebsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10949 f3b2605a-c512-4ea7… 
Nov 4 2013
d592b4689e92sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10948 f3b2605a-c512-4ea7… 
Nov 4 2013
52779f898fa2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10947 f3b2605a-c512-4ea7… 
Nov 4 2013
5e6680916b94sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10946 f3b2605a-c512-4ea7… 
Nov 4 2013
ed9d5b6dc43fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10945 f3b2605a-c512-4ea7… 
Nov 4 2013
6afeb95e53ebsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10944 f3b2605a-c512-4ea7… 
Nov 4 2013
bbc2b231ba53sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10943 f3b2605a-c512-4ea7… 
Nov 4 2013
d1d32497ae66sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10942 f3b2605a-c512-4ea7… 
Nov 4 2013
6eac9cb9bc4fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10941 f3b2605a-c512-4ea7… 
Nov 4 2013
bbeddc892238sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10940 f3b2605a-c512-4ea7… 
Nov 4 2013
0b7666f338a5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10937 f3b2605a-c512-4ea7… 
Nov 4 2013
0c047f2ce868sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10936 f3b2605a-c512-4ea7… 
Nov 4 2013
5f9001a59de0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10935 f3b2605a-c512-4ea7… 
Nov 4 2013
519dd71a0bacsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10934 f3b2605a-c512-4ea7… 
Nov 4 2013
53b308a66110sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10933 f3b2605a-c512-4ea7… 
Nov 4 2013
2353a9d74c05sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10932 f3b2605a-c512-4ea7… 
Nov 4 2013
1dc726ef168dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10931 f3b2605a-c512-4ea7… 
Nov 4 2013
3b6c9afb095bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10928 f3b2605a-c512-4ea7… 
Nov 4 2013
11019e5874d9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10927 f3b2605a-c512-4ea7… 
Nov 4 2013
82ebf90e493dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10926 f3b2605a-c512-4ea7… 
Nov 4 2013
63795ebbcc75sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10925 f3b2605a-c512-4ea7… 
Nov 4 2013
2f815e9f3c20sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10924 f3b2605a-c512-4ea7… 
Nov 4 2013