@@ -44,17 +44,20 @@ Having said that, here are the organizational rules::
44
44
45
45
Currently we have the following branches in use::
46
46
47
- master The active development branch.
47
+ master The active development branch.
48
48
49
- PHP-7.1 Is used to release the PHP 7.1.x series. This is a prerelease
50
- version.
51
-
52
- PHP-7.0 Is used to release the PHP 7.0.x series. This is a current
49
+ PHP-7.2 Is used to release the PHP 7.2.x series. This is a current
53
50
stable version and is open for bugfixes only.
54
51
55
- PHP-5.6 Is used to release the PHP 5.6 .x series. This is a current
52
+ PHP-7.1 Is used to release the PHP 7.1 .x series. This is a current
56
53
stable version and is open for bugfixes only.
57
54
55
+ PHP-7.0 Is used to release the PHP 7.0.x series. This is an old
56
+ stable version and is open for security fixes only.
57
+
58
+ PHP-5.6 Is used to release the PHP 5.6.x series. This is an old
59
+ stable version and is open for security fixes only.
60
+
58
61
PHP-5.5 This branch is closed.
59
62
60
63
PHP-5.4 This branch is closed.
@@ -110,7 +113,7 @@ The format of the commit messages is pretty simple.
110
113
An Example from the git project (commit 2b34e486bc):
111
114
112
115
pack-objects: Fix compilation with NO_PTHREDS
113
-
116
+
114
117
It looks like commit 99fb6e04 (pack-objects: convert to use
115
118
parse_options(), 2012-02-01) moved the #ifdef NO_PTHREDS around but
116
119
hasn't noticed that the 'arg' variable no longer is available.
0 commit comments