763 commits

Author	SHA1	Message	Date
Brad Davis	9fbd5d79e4	Removing duplicate declaration	2015-04-24 17:46:56 -07:00
Brad Davis	fdf2f8395d	Bad lambda type	2015-04-24 17:28:43 -07:00
Brad Davis	eb02bdc67f	Dangling function	2015-04-24 16:57:39 -07:00
Brad Davis	dab8761c71	Merge remote-tracking branch 'upstream/master' into ui-refactor	2015-04-24 16:46:48 -07:00
Brad Davis	e7b8efc2d9	Cleaning up unused stuff	2015-04-24 16:44:48 -07:00
Brad Davis	08d60c6a01	Fixing message dialog	2015-04-24 16:19:39 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Brad Davis	1ff8c67576	More work on menus and some code cleanup	2015-04-24 12:54:11 -07:00
Brad Davis	1d316a1872	Still working on menus	2015-04-23 23:41:09 -07:00
Brad Davis	f17387fab4	Working on menus	2015-04-23 21:23:21 -07:00
Brad Davis	bb1c73adc7	Working on menus	2015-04-23 14:24:01 -07:00
Brad Davis	9a8207610d	Bad merge	2015-04-23 14:23:15 -07:00
Brad Davis	8cb298a55b	Working on menus	2015-04-23 14:23:15 -07:00