diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-12-10 12:53:20 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@digia.com> | 2013-12-10 12:53:20 +0100 |
| commit | 9f831dde07cb2411808534e76669b28a1b76e21d (patch) | |
| tree | ed6252d64c9a3ab27aa93786272cda1b6008f3c7 /src/plugins/projectexplorer/projectexplorer.qrc | |
| parent | cdac81f896ef4b052d76f96485a08e6ec13696b8 (diff) | |
| parent | ea1a92484ac99057b06130a012164bf9788650e9 (diff) | |
| download | qt-creator-9f831dde07cb2411808534e76669b28a1b76e21d.tar.gz | |
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorer.qrc')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.qrc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc index 85ea369bbe..896b5dc4ab 100644 --- a/src/plugins/projectexplorer/projectexplorer.qrc +++ b/src/plugins/projectexplorer/projectexplorer.qrc @@ -23,6 +23,7 @@ <file>images/compile_error.png</file> <file>images/compile_warning.png</file> <file>images/BuildSettings.png</file> + <file>images/CodeStyleSettings.png</file> <file>images/RunSettings.png</file> <file>images/EditorSettings.png</file> <file>images/ProjectDependencies.png</file> |