Merge from 3.6.

This commit is contained in:
Larry Hastings 2017-01-17 01:06:09 -08:00
parent 1741441649
commit ea32cb16d7
1 changed files with 2 additions and 1 deletions

View File

@ -148,8 +148,8 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4 737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1 3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5 619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1 e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1
b662f47769213f23325144b80782c05764d0f053 v3.4.6
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1 5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2 0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3 82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
@ -168,6 +168,7 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1 68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2 4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2
de530d7f21c0398bb2a2b67716e0638e5fadf727 v3.5.3rc1 de530d7f21c0398bb2a2b67716e0638e5fadf727 v3.5.3rc1
1880cb95a742cd001c67677de5c4efeab169416c v3.5.3
5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1 5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1
37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2 37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2
f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3 f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3