3 Commits

Author	SHA1	Message	Date
jacksonmj	4006bdf4c2	Merge branch 'upstream' into dev	2011-01-11 13:44:52 +00:00
jacksonmj	144e4bdb69	Begin cleanup of update functions	2011-01-09 19:23:05 +00:00
jacksonmj	685ede0643	More electricity rewrite.	2011-01-07 22:20:47 +00:00