added merge() method
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Mon, 25 Apr 2011 18:09:29 +0000 (14:09 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Mon, 25 Apr 2011 18:09:29 +0000 (14:09 -0400)
commit711356bf60f81831da0e844ffefe03787a752ea3
tree0ef8382553d1de78dffe7103ed70cc940d388e5f
parentbdc1f1681ecd8e1b784494e481a21aad4b4e973b
added merge() method
sfa/rspecs/sfa_rspec.py