StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity
7aab85251e
qTox/widget/form
History
Dubslow 7aab85251e Merge branch 'master' into profiles 
Holy shit first big merge of my career, I'm mildly amazed it even compiles

Conflicts:
	core.cpp
	widget/form/settingsform.cpp
	widget/form/settingsform.h
	widget/widget.cpp
2014-09-05 03:53:00 -05:00
..
addfriendform.cpp removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
addfriendform.h removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
chatform.cpp fix #243 : Smileys are broken 2014-09-01 18:55:07 +07:00
chatform.h Fix #219, handle av media changes 2014-08-29 19:20:34 +02:00
filesform.cpp removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
filesform.h removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
groupchatform.cpp use Style::get 2014-08-11 17:23:41 +02:00
groupchatform.h removed "the super ugly hack", Widget derives from QMainWindow 2014-08-11 10:00:08 +02:00
settingsform.cpp Merge branch 'master' into profiles 2014-09-05 03:53:00 -05:00
settingsform.h Merge branch 'master' into profiles 2014-09-05 03:53:00 -05:00