Merge remote-tracking branch 'origin/Applications/17.12'

Authored by lbeltrame on Feb 5 2018, 6:13 AM.

Description

Merge remote-tracking branch 'origin/Applications/17.12'

Conflicts:
CMakeLists.txt [version numbers]

Details

Committed
lbeltrameFeb 5 2018, 6:13 AM
Parents
R78:c1f5f6929122: Fix use-after-free
R78:92a5fc9d780a: Fix some complicated plural messages
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
c1f5f6929122D7591dkurz
Fix use-after-free 
Feb 4 2018
0cf90f554d0fmlaurent
GIT_SILENT: Prepare 5.7.2 
Jan 23 2018
e55a349e8659mlaurent
GIT_SILENT: Prepare 5.7.2 
Jan 12 2018
9d904283af1bmlaurent
GIT_SILENT: Prepare 5.7.1 
Dec 31 2017
f898ebb8d155mlaurent
GIT_SILENT: Prepare 5.7.1 
Dec 15 2017
94ab9b4874famlaurent
GIT_SILENT: Prepare 5.7.0 
Dec 4 2017
7d96da52368dmlaurent
GIT_SILENT: Prepare 5.7.0 
Dec 2 2017