r20087 - in /branches/relax_disp: ./ pipe_control/ test_suite/system_tests/ user_functions/ -- June 13, 2013 - 11:20

Author: bugman
Date: Thu Jun 13 11:20:55 2013
New Revision: 20087

URL: http://svn.gna.org/viewcvs/relax?rev=20087&view=rev
Log:
Merged revisions 20081-20082,20084-20085 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20081 | bugman | 2013-06-13 10:22:24 +0200 (Thu, 13 Jun 2013) | 3 lines
  
  Removed the pipe_control.dipole_pair module as its contents is now in 
pipe_control.interatomic.
........
  r20082 | bugman | 2013-06-13 10:54:17 +0200 (Thu, 13 Jun 2013) | 3 lines
  
  Removed the dipole_pair module from the pipe_control package __all__ list.
........
  r20084 | bugman | 2013-06-13 11:01:22 +0200 (Thu, 13 Jun 2013) | 5 lines
  
  Merged the interatom.create user function into interatom.define.
  
  These user functions had overlapping functionality which would be confusing 
for a user.
........
  r20085 | bugman | 2013-06-13 11:18:11 +0200 (Thu, 13 Jun 2013) | 3 lines
  
  Added polish to all of the interatom user function docstrings.
........

Removed:
    branches/relax_disp/pipe_control/dipole_pair.py
Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/__init__.py
    branches/relax_disp/pipe_control/interatomic.py
    branches/relax_disp/test_suite/system_tests/interatomic.py
    branches/relax_disp/user_functions/interatom.py

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/relax_disp/pipe_control/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/__init__.py?rev=20087&r1=20086&r2=20087&view=diff

Removed: branches/relax_disp/pipe_control/dipole_pair.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/dipole_pair.py?rev=20086&view=auto

Modified: branches/relax_disp/pipe_control/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/interatomic.py?rev=20087&r1=20086&r2=20087&view=diff

Modified: branches/relax_disp/test_suite/system_tests/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/interatomic.py?rev=20087&r1=20086&r2=20087&view=diff

Modified: branches/relax_disp/user_functions/interatom.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/interatom.py?rev=20087&r1=20086&r2=20087&view=diff