Skip to content

Commit 65c5c55

Browse files
committed
Merge branch 'patch-release'
2 parents 5475ca1 + 38c8715 commit 65c5c55

File tree

13 files changed

+610
-30
lines changed

13 files changed

+610
-30
lines changed

.github/workflows/build-android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-android
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

.github/workflows/build-emscripten.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-emscripten
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

.github/workflows/build-ios-tvos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-ios-tvos
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

.github/workflows/build-linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-linux64-and-arm
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

.github/workflows/build-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-macos
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

.github/workflows/build-msys2.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-msys2
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

.github/workflows/build-vs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: build-vs
33
on:
44
push:
55
paths-ignore:
6-
- '**/README.md'
6+
- '**/*.md'
77
pull_request:
88
paths-ignore:
9-
- '**/README.md'
9+
- '**/*.md'
1010

1111
jobs:
1212

CHANGELOG.md

Lines changed: 221 additions & 0 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ This granularity makes the code easier to deal with in cases where some things h
8484

8585
#### Submitting the pull request
8686

87-
- Submit your pull request to the __`master`__ branch of openFrameworks (which you branched off from), _not_ the `stable` branch.
87+
- If the default branch shown on the OF github repo is __`patch-release`__ submit your pull request to that branch if it is addressing a bug or regression. Otherwise submit your pull request to the __`master`__ branch of openFrameworks (which you branched off from), and _not_ the `stable` branch.
8888
- All pull requests that contain changes that need to be in the changelog **must include relevant additions to `CHANGELOG.md`**. Use previous entries as a guide for style/indentation/etc.
8989
- In the comments field on your new pull request, enter a description of everything that the code in the pull request does.
9090
- This description is the first contact most of the core team will have with your code, so you should use it to explain why your pull request is awesome and we should accept it.

0 commit comments

Comments
 (0)