Fix compile error with DPTR
Merge branch 'master' into master-osx
Merge branch 'master' into master-osx
Merge branch 'master' into master-osx
Fix font rendering on OSX 10.9 (Mavericks)
Add images for icons
Merge branch 'master-osx' of stewart.vectec.net:qzdl into master-osx
ZDL3 OSX icon
Merge branch '3.2.2.3'
Bump version numbers for Linux and Mac
Merge branch '3.2.2.3'
Set name for ZDL Mac
Set ZDL name for Mac
Merge branch '3.2.2.3'
Merge branch 'master' into 3.2.3.0