Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
CMakeLists.txt
config-kdevplatform.h.cmake
language/interfaces/idefinesandincludesmanager.h
util/duchainify/main.cpp
Description
Description
Details
Details
- Committed
skalinichev Jul 11 2014, 4:34 PM - Parents
- R32:6e73b8a11a2d: Move the IDefinesAndIncludesManager interface to KDevelop.
R32:20257aee03d6: Fix invalid fwd declarations - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 6e73b8a11a2d | mwolff | Move the IDefinesAndIncludesManager interface to KDevelop. | Jul 11 2014 | |||
| 98546935bb2f | mwolff | Merge branch '1.7' | Jul 11 2014 | |||
| 4ad36ef98171 | mwolff | Update version to 1.7.60 and bump SO, plugin and ItemRepo versions. | Jul 11 2014 | |||
| 4a9c071b043e | apol | Prevent crash | Jul 11 2014 | |||
| 584fd0213e5d | skalinichev | Properly support out of project files. | Jul 10 2014 | |||
| 393725de831e | Denis Steckelmacher | Properly disconnect the cursorPositionChanged signal when a navigation widget… | Jul 10 2014 | |||
| e202bde89d06 | kfunk | duchainify: String fixes | Jul 9 2014 |