summaryrefslogtreecommitdiff
path: root/src/plugins/glsleditor/glslcompletionassist.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
* | more Id type fixeshjk2011-11-101-2/+2
|/
* New code assist APILeandro Melo2011-05-181-0/+478