tux3 e79d40e356 Merge branch 'pr1446' ... Conflicts: src/chatlog/chatlog.cpp src/chatlog/content/filetransferwidget.cpp src/core.cpp src/core/coreencryption.cpp src/toxdns.cpp src/widget/form/chatform.cpp src/widget/form/genericchatform.cpp src/widget/friendwidget.cpp src/widget/widget.cpp		2015-05-07 22:00:50 +02:00
..
update-server	Fix coding style and add copyright header	2015-03-21 08:59:28 +00:00
buildPackages.sh	Fixed bash shebangs to use /usr/bin/env for better compatibility	2015-03-25 22:16:22 -07:00
libeay32.dll	added some gnuwin32 programms required for bootstrapping	2014-07-03 13:45:29 +02:00
libiconv2.dll	added some gnuwin32 programms required for bootstrapping	2014-07-03 13:45:29 +02:00
libintl3.dll	added some gnuwin32 programms required for bootstrapping	2014-07-03 13:45:29 +02:00
libssl32.dll	added some gnuwin32 programms required for bootstrapping	2014-07-03 13:45:29 +02:00
publish.py	Update publish.py	2014-10-01 15:06:03 +02:00
unzip.exe	added some gnuwin32 programms required for bootstrapping	2014-07-03 13:45:29 +02:00
wget.exe	added some gnuwin32 programms required for bootstrapping	2014-07-03 13:45:29 +02:00