git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11229 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11230 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11231 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11232 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11233 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11234 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11235 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11236 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11238 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11239 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	doc/Manual.txt
	lib/gpu/lal_sw.cu


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11243 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11245 f3b2605a-c512-4ea7-a41b-209d697bcdaa
make code compile with the inofficial changes in place from mike brown's repo


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11246 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
	src/RIGID/fix_rigid_small.cpp
make gpu library compile with mikes gpu library mods
update for new desktop installation