src/plugins/qt4projectmanager/qtoptionspage.cpp · 1e46cb424e05a8be9909b13b2031625b691839ec · Tobias Hunger / qt-creator · GitLab

Snippets Groups Projects

15 years ago
b0b5bde2
Merge remote branch 'origin/1.3' · b0b5bde2
Oswald Buddenhagen authored 15 years ago
```
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/watchhandler.cpp
```
b0b5bde2

History
Merge remote branch 'origin/1.3'
Oswald Buddenhagen authored 15 years ago
```
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/watchhandler.cpp
```