Vladimír Čunát 7a005601d4 Merge branch 'master' to resolve conflicts		2016-05-05 08:25:38 +02:00
..
darwin	Merge pull request #14706 from acowley/frameworks-GL	2016-04-24 22:38:47 +03:00
gnu	samba: Revert style changes and get rid of some dependencies	2015-06-01 15:35:59 +02:00
linux	Merge pull request #15217 from LumiGuide/fix-mdadm-sendmail	2016-05-04 20:09:02 +02:00
windows	mingw: update 3.1.0 -> 4.0.6	2016-04-21 13:38:20 +02:00