5 Commits

Author	SHA1	Message	Date
Timothy Warren	90bceb4fe9	Revert "Added object_merge function and tests" ... This reverts commit 1237ea511e6591b9ba488f6c5fa13284b99e27e2.	2011-10-24 12:26:00 -04:00
Timothy Warren	1237ea511e	Added object_merge function and tests	2011-10-24 12:24:10 -04:00
Timothy Warren	c15fff3b4b	Updated .gitignore file	2011-10-19 17:57:49 -04:00
Timothy Warren	5206f6f259	Updated compiled js file	2011-10-18 11:16:51 -04:00
Timothy Warren	06fa41aa0c	Remove kis-custom.js	2011-10-18 11:12:40 -04:00