8 commits

Author	SHA1	Message	Date
archshift	237d079aad	Merge commit upstream/master into issue-7-fix	2014-04-28 19:44:43 -07:00
archshift	5a9c2ce5ea	IT'S ALIVE!	2014-04-28 19:40:39 -07:00
Thomas Edvalson	a226dc57bf	Need to add Xcursor to linker?	2014-04-25 23:01:58 -04:00
Thomas Edvalson	c51e4822b1	Fixed CMake's import of GLFW.	2014-04-25 10:50:25 -04:00
bunnei	7a136b8a84	fixes to build on linux	2014-04-22 19:42:29 -07:00
bunnei	9527fc74ad	fixed a bunch of errors in CMakeLists	2014-04-09 20:28:43 -07:00
bunnei	6b83509a7e	updated CMakeLists	2014-04-09 23:09:05 -04:00
ShizZy	8bb0c457bc	renamed from citrus to citra	2013-09-26 17:34:48 -04:00