Philippe Renon 33188bd78e Merge remote-tracking branch 'upstream/master' into next ...

# Conflicts:
#	ground/gcs/src/plugins/coreplugin/connectionmanager.cpp

2016-12-13 00:56:32 +01:00

..

linux

LP-404 replace opfw_resource target with fw_resource

2016-09-22 09:04:59 +02:00

osx

Fixed QT_DIR for OSX package build.

2016-01-29 19:03:50 +01:00

winx86

LP-406 win installer: change section order

2016-09-21 23:11:29 +02: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

Fixed QT_DIR for OSX package build.

2016-01-29 19:03:50 +01:00

Linux.mk

nsis packaging remove extra template layer

2016-01-10 17:11:46 +00:00

Windows.mk

LP-187 MSYS2: add arch to installer filename

2016-01-10 17:11:46 +00:00