From 6dfb0caab31e3dcda5e26215efccbe91329a42fd Mon Sep 17 00:00:00 2001 From: Gol-D-Ace Date: Wed, 20 Mar 2019 02:38:00 +0100 Subject: [PATCH] UI: Remove and ignore obs.rc This file gets automatically generated from obs.rc.in by CMake and could get accidentally committed. --- .gitignore | 1 + UI/obs.rc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 UI/obs.rc diff --git a/.gitignore b/.gitignore index 19fb10b30..f78f47adb 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ x64/ ipch/ GeneratedFiles/ .moc/ +/UI/obs.rc /other/ diff --git a/UI/obs.rc b/UI/obs.rc deleted file mode 100644 index 505bd21f7..000000000 --- a/UI/obs.rc +++ /dev/null @@ -1 +0,0 @@ -IDI_ICON1 ICON DISCARDABLE "../cmake/winrc/obs-studio.ico"