Skip to content

Commit

Permalink
Merge branch 'fixes' of https://github.com/revel8n/dolphin into fixes
Browse files Browse the repository at this point in the history 
Conflicts:
	Source/Core/DiscIO/VolumeDirectory.cpp
  • Loading branch information
@revel8n
revel8n committed Sep 26, 2015
2 parents d4c2ca4 + dc0fa15 commit d812d80
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit d812d80

Please sign in to comment.