Merge remote-tracking branch 'origin/master' into gsoc-sagar-hydro_electricity
Description
Description
Details
Details
- Committed
scagarwal Jul 14 2015, 11:41 AM - Parents
- R2:7fd83f304f2c: cmake, remove a useless link directive
R2:59256b556bf1: hydroelectric, IntroMessage fixed - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
7fd83f304f2c | bcoudoin | cmake, remove a useless link directive | Jul 14 2015 | |||
9ec6f056a205 | bcoudoin | core, create the main window following the screen aspect ratio | Jul 14 2015 | |||
55c385c5ee17 | bcoudoin | core, on desktop with hdpi screen we also need to use m_ratio | Jul 13 2015 | |||
31c794ac6dfb | bcoudoin | android build, add on to the version when x86 is selected | Jul 13 2015 | |||
417351926cf5 | bcoudoin | android build, name the apk depending on the options | Jul 13 2015 | |||
82e5b96fa80e | bcoudoin | build, point to lconvert and lrelease relative to Qt5_DIR | Jul 13 2015 | |||
508366ca3f13 | bcoudoin | android build, point to the latest sdk | Jul 13 2015 | |||
8afeafeb6665 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 13 2015 |