6 Commits

Author	SHA1	Message	Date
Axel Kohlmeyer	01830d476b	Merge branch 'master' into lammps-icms ... Resolved Conflicts: python/lammps.py src/MAKE/Makefile.mingw src/MAKE/Makefile.openmpi src/MAKE/Makefile.serial src/MAKE/Makefile.serial_debug src/USER-CUDA/verlet_cuda.cpp	2012-08-14 03:35:29 -04:00
sjplimp	c6878811f0	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8602 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2012-08-10 23:13:26 +00:00
Axel Kohlmeyer	959946a023	import patch from joe jordan to find the lammps DSO automatically	2012-04-27 10:37:04 -04:00
sjplimp	4c98b2d1a9	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7710 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2012-02-06 18:19:20 +00:00
sjplimp	5a158918de	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7237 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2011-11-28 22:42:51 +00:00
sjplimp	453aba29e5	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5201 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2010-11-02 15:07:40 +00:00