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

Resolved Conflicts:
	doc/Manual.html
	doc/Manual.txt
This commit is contained in:
Axel Kohlmeyer
2014-10-02 11:11:07 -04:00
14 changed files with 553 additions and 76 deletions

View File

@ -88,6 +88,5 @@ void WriteDump::command(int narg, char **arg)
// delete the Dump instance and local storage
delete dump;
delete[] dumpargs;
delete [] dumpargs;
}