ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

.gitignore: fix the build directory pattern

This commit is contained in:
Tillmann Karras 2014-03-13 00:39:55 +01:00
parent 2fcaca0603
commit 7e39cf3b0d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -5,7 +5,7 @@ Thumbs.db
# Ignore autogenerated source files # Ignore autogenerated source files
Source/Core/Common/scmrev.h Source/Core/Common/scmrev.h
# Ignore files output by build # Ignore files output by build
/[Bb]uild[-_]*/ /[Bb]uild*/
/[Bb]inary/ /[Bb]inary/
/obj/ /obj/
# Ignore various files created by visual studio/msbuild # Ignore various files created by visual studio/msbuild

4
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -61,12 +61,12 @@ void VideoBackend::UpdateFPSDisplay(const std::string& text)
EmuWindow::SetWindowText(StringFromFormat("%s | D3D | %s", scm_rev_str, text.c_str())); EmuWindow::SetWindowText(StringFromFormat("%s | D3D | %s", scm_rev_str, text.c_str()));
} }
std::string VideoBackend::GetName() std::string VideoBackend::GetName() const
{ {
return "D3D"; return "D3D";
} }
std::string VideoBackend::GetDisplayName() std::string VideoBackend::GetDisplayName() const
{ {
return "Direct3D"; return "Direct3D";
} }