claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OBattler
2020-06-29 00:54:02 +02:00
parent ed2d8f9969 af26e19b83
commit 2eceaf77e9
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/c-cpp.yml vendored
View File

@@ -1,10 +1,16 @@
name: C/C++ CI name: C/C++ CI
on: on:
push: push:
branches: [ master ] paths:
- src/**
- .github/workflows/**
pull_request: pull_request:
branches: [ master ] paths:
- src/**
- .github/workflows/**
jobs: jobs:
build: build:

2
src/win/86Box.rc
View File

@@ -8,8 +8,6 @@
* *
* Application resource script for Windows. * Application resource script for Windows.
* *
*
*
* Authors: Miran Grca, <mgrca8@gmail.com> * Authors: Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* David Hrdlička, <hrdlickadavid@outlook.com> * David Hrdlička, <hrdlickadavid@outlook.com>