Dubslow 139cd3f4a6 Merge branch 'encryption' into master ... Conflicts: src/core.cpp src/misc/settings.cpp src/widget/widget.cpp src/widget/widget.h		2015-01-05 20:55:47 -06:00
..
db	check for non-existent file	2014-12-09 17:44:20 -06:00
cdata.cpp	Fix possible heap corruption in CUserId()	2014-11-02 23:39:28 +01:00
cdata.h	Move code into src/	2014-10-07 23:26:25 -05:00
cstring.cpp	Move code into src/	2014-10-07 23:26:25 -05:00
cstring.h	Move code into src/	2014-10-07 23:26:25 -05:00
flowlayout.cpp	Fix #96 with a flow layout for groupchat user list	2014-11-02 10:41:58 +01:00
flowlayout.h	Fix #96 with a flow layout for groupchat user list	2014-11-02 10:41:58 +01:00
serialize.cpp	Teach the AutoUpdater to read a flist	2014-11-09 17:55:38 +01:00
serialize.h	Teach the AutoUpdater to read a flist	2014-11-09 17:55:38 +01:00
settings.cpp	Merge branch 'encryption' into master	2015-01-05 20:55:47 -06:00
settings.h	Merge branch 'encryption' into master	2015-01-05 20:55:47 -06:00
smileypack.cpp	Style corrections	2014-12-11 18:05:52 +00:00
smileypack.h	Embed cylgom and krepa emoticon packs	2014-10-29 19:29:35 +01:00
style.cpp	Add GUI to change theme color	2014-11-15 21:30:20 +01:00
style.h	Add GUI to change theme color	2014-11-15 21:30:20 +01:00