Jan Kaluza 737dd6a062 Fixed merge conflict		2012-12-10 15:09:57 +01:00
..
CMakeLists.txt	merge	2012-11-28 10:10:19 +04:00
ircnetworkplugin.cpp	Postpone room subject forwarding if we haven't sent initial presences yet	2012-11-27 12:51:19 +01:00
ircnetworkplugin.h	Add new line to end of files	2012-12-04 08:26:30 +01:00
main.cpp	Merged SingleIrcNetworkPlugin with IrcNetworkPlugin to not duplicate code. Removed old SingleIrcNetworkPlugin.	2012-09-22 10:38:42 +02:00
session.cpp	Make away state timer faster	2012-12-05 20:56:54 +01:00
session.h	Update away state regularly	2012-12-04 19:21:59 +01:00