Leland Yee amended his stub bill SB 47. You can get the text here:
http://leginfo.legislature.ca.gov/fa...arch_keywords=
Practically everything semi-automatic would be an assault weapon but you can keep anything you had legally or legally bought up until December 31, 2013 IF you register it by July 1, 2014.
Mick