7 commits

Author	SHA1	Message	Date
Chris Eagle	095cdb5f9d	Merge remote-tracking branch 'upstream/master'	2015-08-26 08:25:37 -07:00
Jonathon Reinhart	60d0004329	remove executable bit from mode of source files ... http://stackoverflow.com/questions/1580596/how-do-i-make-git-ignore-file-mode-chmod-changes	2015-08-26 05:34:31 -04:00
Chris Eagle	9023e77201	Fixed bug introduced in uc_mem_map	2015-08-26 00:26:42 -07:00
Chris Eagle	c1514609b1	Add missing line from upstream patch	2015-08-25 21:22:58 -07:00
Chris Eagle	e280088caf	Add 16-bit example, tracking upstream	2015-08-25 21:01:48 -07:00
Chris Eagle	fafdac516a	Make a bad Makefile slightly less bad	2015-08-25 11:41:14 -07:00
Chris Eagle	0359c44462	Initial checkin of unicorn java binding	2015-08-25 03:21:47 -07:00