Alexander Alekhin 45dd575ed2 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 ... Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch" This reverts commit 9ba9358ecb. Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)" This reverts commit f185802489.		2018-06-04 19:26:10 +03:00
..
ts	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-06-04 19:26:10 +03:00
ts.hpp	Fixed two warnings produced by clang	2018-03-29 13:24:04 +03:00