« back to all changes in this revision
Viewing changes to share/qtcreator/snippets/ifelse.snp
- Committer: Bazaar Package Importer
- Date: 2009-07-19 16:23:52 UTC
- mfrom: (3.1.2 sid)
- Revision ID: james.westby@ubuntu.com-20090719162352-oni0h8hrrkdd3sil
* Merge from debian unstable (LP: #399414), remaining changes:
- Add qt-creator transitional package.
* debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1).
- Add qt-creator transitional package.
* debian/control: Conflicts on qt-creator (<< 1.2.1-1ubuntu1).
- files added:
- bin/bin.pro
- doc/images/completion
- share/qtcreator/gdbmacros/test
- share/qtcreator/translations
- src/plugins/coreplugin/images/welcomemode
- src/plugins/debugger/gdb
- src/plugins/debugger/script
- src/plugins/debugger/shared
- src/plugins/debugger/tcf
- src/plugins/duieditor
- src/plugins/qmlprojectmanager
- src/tools/qtcdebugger
- tests/auto/qstringbuilder
- tests/manual/distribution
- files removed:
- doc/examples/addressbook-sdk/README
- doc/examples/addressbook-sdk/part6
- doc/examples/addressbook-sdk/part7
- src/plugins/coreplugin/html
- src/plugins/coreplugin/html/images
- src/plugins/debugger/win
- src/plugins/qhelpproject
- translations
- files modified:
- bin/qtcreator
- src/plugins/coreplugin/images/qtcreator_logo_256.png *
- src/plugins/coreplugin/images/qtcreator_logo_512.png *
added
removed
share/qtcreator/snippets/ifelse.snp
