10 Commits

Author	SHA1	Message	Date
degasus	e0ffdda26e	Merge branch 'immediate-removal' into GLSL-master ... Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal so we get less conflicts by merging	2013-01-24 16:58:28 +01:00
Sonicadvance1	0ba1794df3	Fix AGL.cpp	2013-01-21 21:48:02 +00:00
degasus	84debc17d5	fix msaa ... blitting between msaa fbos may not scale. So we need to resolve the efb before swapping.	2013-01-09 01:50:52 +01:00
NeoBrainX	09197e0ffc	X11: Disable OSD hotkeys when the corresponding option is disabled.	2013-01-08 18:16:47 +01:00
Ryan Houdek	64afbade33	Fix 4 warnings on OSX	2012-12-30 04:32:37 -06:00
Ryan Houdek	5169804a61	Remove duplicated X11 code.	2012-12-26 12:12:26 -06:00
Ryan Houdek	9a58f9a3bb	Rename another function...	2012-12-26 00:34:09 -06:00
Ryan Houdek	f4e7a280a9	Remove cg.lib from some files for Windows and renaming a function.	2012-12-26 00:07:43 -06:00
Ryan Houdek	c884dbf654	Mistype in WX.cpp	2012-12-25 19:18:03 -06:00
Ryan Houdek	01953ff64a	Rename the interface files and hopefully fix OSX building.	2012-12-25 19:08:24 -06:00