summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-12-24 23:05:08 +0100
committerCarl Hetherington <cth@carlh.net>2024-12-24 23:05:08 +0100
commit8c68eba118d73fb6619b20d39b3b6fac77085c7a (patch)
tree1d0376b46508bf6ac8557478e6df13ca6f8b348f
parent37b261006bc57df7d1f13f21f46d7fc824ed87ef (diff)
Tweak DEVELOP.md for 2.18.0 release.
-rw-r--r--DEVELOP.md7
1 files changed, 1 insertions, 6 deletions
diff --git a/DEVELOP.md b/DEVELOP.md
index 5c16c6a18..75233d369 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -36,15 +36,10 @@ As we have no `film' folder to log to during disk writes, the logs end up:
## Branches
-The main dcpomatic repo has the following branches:
-
-* `main` - the main development branch; contains 2.16.x versions
-* `v2.17.x` - development branch for v2.17.x versions; `main` is merged into this branch.
-
The `test/data` submodule has the following branches:
* `v2.16.x` - branch for use with v2.16.x versions
-* `v2.18.x` - branch for use with v2.17.x versions (as will become v2.18.x)
+* `v2.18.x` - branch for use with v2.18.x versions
## Player stress testing