Olivier Goffart be1b39067d Merge branch 'master' into new-ui		2015-04-27 12:32:12 +02:00
..
3rdparty	Fix compilation with Qt 5.5	2015-04-19 11:02:43 +02:00
cmd	Merge branch 'master' into new-ui	2015-04-27 12:32:12 +02:00
crashreporter	Fix a crash in the crash reporter on OSX	2015-03-06 19:28:53 +01:00
gui	Merge branch 'master' into new-ui	2015-04-27 12:32:12 +02:00
libsync	Merge branch 'master' into new-ui	2015-04-27 12:32:12 +02:00
CMakeLists.txt	Merge remote-tracking branch 'origin/master' into crashreporter	2014-11-11 23:53:38 +01:00