Merge remote-tracking branch 'origin/1.7'
Conflicts:
CMakeLists.txt
shell/textdocument.cpp
Description
Description
Details
Details
- Committed
zhanghuijie Oct 12 2015, 4:59 AM - Parents
- R32:b811f67e945b: Revert "ensure topData->m_importers/topData->m_importedContexts is not nullptr…
R32:3785846b75c0: Ask before formatting a whole folder of files - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| b811f67e945b | zhanghuijie | Revert "ensure topData->m_importers/topData->m_importedContexts is not nullptr… | Oct 12 2015 | |||
| a3a4efa3b43d | brauch | backport null check from ad8947a2 | Oct 11 2015 | |||
| 041bd5b870ae | mwolff | Set version to 1.7.2 | Oct 11 2015 |