Merge remote-tracking branch 'origin/master' into gsoc-sagar-hydro_electricity

Authored by scagarwal.

Description

Merge remote-tracking branch 'origin/master' into gsoc-sagar-hydro_electricity

Details

Merged Changes

CommitAuthorDetailsCommitted
7fd83f304f2cbcoudoin
cmake, remove a useless link directive 
Jul 14 2015
9ec6f056a205bcoudoin
core, create the main window following the screen aspect ratio 
Jul 14 2015
55c385c5ee17bcoudoin
core, on desktop with hdpi screen we also need to use m_ratio 
Jul 13 2015
31c794ac6dfbbcoudoin
android build, add on to the version when x86 is selected 
Jul 13 2015
417351926cf5bcoudoin
android build, name the apk depending on the options 
Jul 13 2015
82e5b96fa80ebcoudoin
build, point to lconvert and lrelease relative to Qt5_DIR 
Jul 13 2015
508366ca3f13bcoudoin
android build, point to the latest sdk 
Jul 13 2015
8afeafeb6665l10n daemon script
SVN_SILENT made messages (after extraction) 
Jul 13 2015