Merge branch 'master' of https://github.com/86Box/86Box

2020-06-29 00:54:02 +02:00
parent ed2d8f9969 af26e19b83
commit 2eceaf77e9
2 changed files with 8 additions and 4 deletions
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -1,10 +1,16 @@
 name: C/C++ CI

 on:
+
  push:
-    branches: [ master ]
+    paths:
+    - src/**
+    - .github/workflows/**
+
  pull_request:
-    branches: [ master ]
+    paths:
+    - src/**
+    - .github/workflows/**

 jobs:
  build:
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -8,8 +8,6 @@
 *
 *		Application resource script for Windows.
 *
- *
- *
 * Authors:	Miran Grca, <mgrca8@gmail.com>
 *		Fred N. van Kempen, <decwiz@yahoo.com>
 *		David Hrdlička, <hrdlickadavid@outlook.com>