bitmask_launcher.git, branch master [bitmask_launcher] Merge branch 'release-0.3.2' 2014-09-26T13:33:10+00:00 Tomás Touceda chiiph@leap.se 2014-09-26T13:33:10+00:00 dce318792f5abda706c5437f363dc8212c7c50f3

Fold in changes 2014-09-26T13:32:28+00:00 Tomás Touceda chiiph@leap.se 2014-09-26T13:32:28+00:00 e448f40dfbb913742fa2640c8af16fe000d2b401

Merge branch 'ivanalejandro0/bug/remove-defines' into develop 2014-09-25T01:00:48+00:00 Ruben Pollan meskio@sindominio.net 2014-09-25T01:00:48+00:00 4fc0948f72c1c10f68674af59df2ba5465960fa3

Revert "Prevent incompatibility issues with c++11" 2014-09-23T22:12:54+00:00 Ivan Alejandro ivanalejandro0@gmail.com 2014-09-23T22:12:54+00:00 a3f95c3ca516af4146f1bdf1c95fa1e2d133033f This reverts commit 3b45e320964edee7cd9b114935ead200ff8e9c3a. Remove define/undef since they cause an error in the launcher's compilation with the current bundler script that uses boost 1.56.0
This reverts commit 3b45e320964edee7cd9b114935ead200ff8e9c3a.

Remove define/undef since they cause an error in the launcher's
compilation with the current bundler script that uses boost 1.56.0
Merge remote-tracking branch 'refs/remotes/meskio/feature/6122_add_verbosity' into develop 2014-09-22T16:04:54+00:00 Tomás Touceda chiiph@leap.se 2014-09-22T16:04:54+00:00 e20ece7b223e0c172979c85cb8fa9b41429be812

Merge remote-tracking branch 'refs/remotes/meskio/bug/6104_select_libqt' into develop 2014-09-22T16:04:00+00:00 Tomás Touceda chiiph@leap.se 2014-09-22T16:04:00+00:00 c354574a57fcd4942beb8fe78f810194fa63ec7a

Add some logging on updates 2014-09-22T15:05:56+00:00 Ruben Pollan meskio@sindominio.net 2014-09-22T15:05:56+00:00 4914d07fd577227f0d84e908cff489e104d7ec55

Make symlinks instead of moving libraries around 2014-09-21T19:19:03+00:00 Ruben Pollan meskio@sindominio.net 2014-09-21T19:19:03+00:00 4615bd0e23288c2d5943c95babcad80305ad6f4b The updater has problems with moving files, as it things that the dissapear file is missing and needs to be updated. Instead we keep libQt* libs as lib/libQt*.non-ubuntu and make symlinks to them in case of needed by the platform.
The updater has problems with moving files, as it things that the
dissapear file is missing and needs to be updated. Instead we keep
libQt* libs as lib/libQt*.non-ubuntu and make symlinks to them in case
of needed by the platform.
Prevent incompatibility issues with c++11 2014-09-19T19:00:48+00:00 Ruben Pollan meskio@sindominio.net 2014-09-19T16:51:43+00:00 3b45e320964edee7cd9b114935ead200ff8e9c3a Set BOOST_NO_CXX11_SCOPED_ENUMS fixes it
Set BOOST_NO_CXX11_SCOPED_ENUMS fixes it
Merge remote-tracking branch 'refs/remotes/meskio/bug/add_i686' into develop 2014-09-12T18:25:55+00:00 Tomás Touceda chiiph@leap.se 2014-09-12T18:25:55+00:00 f3602cd5a58511a48ce572868d1369f2fb94e1ff