# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: david2@system76.com-20161217001309-vse43liv1spuytzy # target_branch: lp:unity # testament_sha1: a59ac10a29952a844589ea064b12279fddf1452a # timestamp: 2016-12-16 17:13:26 -0700 # base_revision_id: ci-train-bot@canonical.com-20161130110659-\ # 7q9s1bjwuuye7vth # # Begin patch === modified file 'unity-shared/UnitySettings.cpp' --- unity-shared/UnitySettings.cpp 2016-11-30 11:06:15 +0000 +++ unity-shared/UnitySettings.cpp 2016-12-17 00:13:09 +0000 @@ -346,7 +346,7 @@ const auto dpi = std::max(dpi_x, dpi_y); if (dpi > DPI_SCALING_LIMIT) - scale = static_cast(std::lround(scale * dpi / DPI_SCALING_LIMIT)); + scale = static_cast(scale * std::lround(dpi / DPI_SCALING_LIMIT)); } return scale; # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXblteYAAXlfgAQQUHP//363 TgC////wUAOnvce1r3mzGl71w0JBTwT1TyanianijT1DynpB6j0h6jPSgBKKGjTE0FPEJkDTQAAA NDQCUQE0TSeIJhNNpGagNAAA0ASKEp6npqfqnlGj0hoMTQAANAAeoJJI0001FP00jYITSbU/UEZH oJkGmj1BIqBNmv9E4QpItcIA5p21KBuxEnJjvjxoMGfw0WjToPVAaIbj1OT2uz1czmR3lNiEdtih wjk4nJB1vBDBQUWVb7GlF+Yh7hF1eCoCA2LZfjQUhAWlvUOdL2DQVyji04sTxCzLODcpiiCqioO1 qgWFQXuylyr5axM0cE49QuKtRhATqwBk80oil2NbkJhPhLEcR0PfQCViO6LeHGG5PXlW22GdMNgj HtyoJYOtURxVG+hlihkRJ5oXsQ+VEWWLkp23Eb8aRtqibs8g2aCZprHvElHpZEYRlmnePYNGMWYk UDZNmmnkrBuEbPYGdyXLkxyKZPAlMRMY1O2iBW1rl5h0xOpjzJbRuUlUkv0bxjL1rtHAj0wjobhi RyuoMg1VBjaaXue/frkOTIJhdW1y4LkeRIDCA7HYmnOystkkqaDpISqzNCUokRYK8kEZlshst25V YzEPuqTZthiUL6J4SKFFPL6pxvZxDNHPvhoGK9AqWXRV1C5jAyxUDAbLywG0HZeLldO6G7P4AZgi xe30sslCygODitE2ShjSlLu7DsstNe+esvXAJ+oJzdiOhc6YcGC9g9/A+fGkwOermldoCE3kkNUG t1LBhmwVvRJyOQbUwkkUqGdWiKQ1XGcWvdScR9PVg2dpMNdy36pwTVdo6ifvv29B7EW4A/DsHZqq bPN+tcMpx8EDhFCPkjJdsra6qZpQeTYN8B0mqcPcbg8J8wmF/MVnw637GOkcb0Y9Esw8HNcOuBmN RFqmfJNVAJz73OqBzbMmS6e1ZOhuLU4r5QyCzU8LY9btVFoVhp3cgSE9tp8lcP1BaaQvBohGYMB7 zWmNgmq5rJZ5hCdExswJKNBge5xee3UwHoZnUuByjVC5oSfxGIQDPSzMmZMtuyvHlN+AKGDLJwQK Q49UlNUy2hyQoer2svZlMUUHQdvdEjYFtW4WtTRL7wzhWFbHIktNhG2ATMv26x8FgqVhpRtev8vT aRMlUTVAt6o5AjqK7rFWrnMqSwI7UqMvRzlkpXA7yScIJIvM16XU0rfEaDaQ3npgCz0SI64FC4S/ t1V06XVcd64VlFMVi2ALQesLOtX7VCrJsdzhA5JqMbEphRJZyN8Bf8XckU4UJB25bXmA