Alessio Morale 6ed06362a7 Merge branch 'master' into next		2015-02-10 23:50:19 +01:00
..
linux	Merge branch 'master' into next	2015-02-10 23:50:19 +01:00
osx	OP-1667 Remove firmware file from packages: removed leftover crap from old attempt	2015-01-04 12:44:58 +13:00
winx86	OP-1667 Remove firmware file from packages: removed leftover crap from old attempt	2015-01-04 12:44:58 +13:00
.gitattributes	OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)	2013-04-05 23:43:58 +03:00
Darwin.mk	OP-1667 Remove firmware file from packages: removed leftover crap from old attempt	2015-01-04 12:44:58 +13:00
Linux.mk	Merge branch 'laurent/OP-1644_Wrong_wizard_neutral' into next	2015-02-07 19:03:36 +01:00
Windows.mk	OP-1667 Remove firmware file from packages: removed leftover crap from old attempt	2015-01-04 12:44:58 +13:00