Skip to content

Commit 208d752

Browse files
committed
contributing, typo
1 parent 48c4221 commit 208d752

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

readme-contributing.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@
88

99
- `v1.5`: current version branch. `main` should be merged into here whenever it's deemed stable enough for testing.
1010

11-
- `v2-wip`: this branch contains "backlogged" changes intended for a v2 overhaul. involves extensive and complicated changes to the processing architecture. it's not yet working, hence the backlog, but it reopresents enough work to be worth saving. will be "salvaging" changes from here to release as v1.5.
11+
- `wip/v2`: this branch contains "backlogged" changes intended for a v2 overhaul. involves extensive and complicated changes to the processing architecture. it's not yet working, hence the backlog, but it reopresents enough work to be worth saving. will be "salvaging" changes from here to release as v1.5.
1212

1313
### working branches:
1414

15-
other working branches branches may exist, and should be named using a prefix and a slash. one of:
15+
other working branches branches may exist, and should preferably be named using a prefix and a slash. we suggest:
16+
17+
`fix/` - for bugfixes and (measurable!) performance improvements.
1618

17-
`fix/` - for bugfixes and performance improvements.
1819
`feature/`- for new user-facing features
19-
`dev/` for primarily developer-facing work, like refactoring or architecture changes.
2020

21-
if you are part of the `monome` organization, go ahead and make your development branch in the main repo.
22-
if you're not, make your working branch on your own fork.
21+
`dev/` for primarily developer-facing work, like refactoring
22+
23+
(if you are part of the `monome` organization, you're welcome to make development branch in the monome repo instead of your personal fork.)

readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ this library was developed at the behest of [monome](https://monome.org), origin
2424

2525
`./clients/` contains sample projects that use the library.
2626

27-
`./clients/softcut_jack_sc/` is a straightforward example: a JACK application that maps OSC commands directly to the softcut API.
27+
`./clients/softcut_jack_osc/` is a straightforward example: a JACK application that maps OSC commands to the softcut API.
2828

2929
### building
3030

0 commit comments

Comments
 (0)