Ryan Huffman 45fdd00608 Merge remote-tracking branch 'upstream/master' into 19598 ... Conflicts: interface/src/ui/FramelessDialog.h		2014-04-28 09:13:00 -07:00
..
src	Merge remote-tracking branch 'upstream/master' into 19598	2014-04-28 09:13:00 -07:00
CMakeLists.txt	make sure gnutls define for ssize_t comes before gnutls include	2014-04-10 10:27:08 -07:00