ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Core/InputCommon
History
Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay 
Conflicts:
	Source/Android/res/values-ja/strings.xml
	Source/Android/res/values/strings.xml
	Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
	Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
	Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
 		2013-11-24 16:12:00 -06:00
..
Src Merge branch 'master' into android-new-control-input-overlay 2013-11-24 16:12:00 -06:00
CMakeLists.txt Basic precompiled header support for Linux/OS X. Shaves 20-30% off full rebuild time on my system. 2013-10-17 00:07:35 -04:00
InputCommon.vcxproj Update to VS2013 and a slew of build-related updates. Notes: 2013-10-26 17:55:38 -07:00
InputCommon.vcxproj.filters Update to VS2013 and a slew of build-related updates. Notes: 2013-10-26 17:55:38 -07:00