degasus fed574d08b solve merge conflict

2013-02-18 18:55:42 +01:00

..

resources

Change the ugly "no banner" banner to the sexy "X" from the website.

2013-02-09 17:04:41 -06:00

Src

Merge branch 'master' into GLSL-master

2013-02-18 18:49:20 +01:00

CMakeLists.txt

first try of osx fix, mostly by pauldachz

2013-02-07 10:34:29 +01:00

Dolphin.vcxproj

solve merge conflict

2013-02-18 18:55:42 +01:00

Dolphin.vcxproj.filters

remove scons files from VS projects

2012-03-18 06:41:12 -07:00

Dolphin.vcxproj.user

vs2010: make -d be passed to debugfast builds launched from vs

2011-02-25 04:00:16 +00:00

DolphinWX.rc

Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not.

2012-12-17 08:33:42 -06:00

Info.plist.in

Applied compile and link flags from SCons build for OS X to CMake build.

2011-12-11 21:27:06 +01:00

resource.h

set svn:eol-style=native for **.h

2008-12-08 04:46:09 +00:00