Merge branch 'master' into mudletDev
misc
Fixed bug where double clicking in empty space would cause seg fault
added a field for double-click characters to stop selecting text on
Fixed bug with double-click high-lighting blank lines causing seg faults
Merge branch 'mudletDev' of https://github.com/vadi2/Mudlet2 into vadi2-mudletDev

Conflicts:
	src/TTextEdit.cpp
Implemented saving/loading and ignoring of characters for double-click hilighting
misc
Stephen Lyons: compiler warning reduction patch
Merge branch 'fixHeiko'

Conflicts:
	src/T2DMap.cpp
Stephen Lyons: warning reduction patch 2
Merge branch 'master' of git://git.code.sf.net/p/mudlet/code
Merge branch 'master' into mudletDev
move to Qt 5.1
Merge branch 'master' of git://git.code.sf.net/p/mudlet/code
Merge branch 'master' into mudletDev
Converted from Phonon to QMediaPlayer
Implemented libzip everywhere
Merge branch 'mudletDev' of https://github.com/Chris7/Mudlet2 into libzip
Complete removal of Quazip and replacement with libzip