Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source

Conflicts:

	share/qtcreator/gdbmacros/gdbmacros.cpp

...

This commit is contained in:

ck

2009-07-20 16:26:58 +02:00

parent 5a71082328 62079b4a38

commit db94734ab3

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available