Merge changes from topic 'network-unavailable-and-offline-are-different'
commit5a330ec192c257fcc6b0563cb14be6488f0c9d15
authorJan Kundrát <jkt@kde.org>
Thu, 12 Jan 2017 08:42:52 +0000 (12 09:42 +0100)
committerGerrit Code Review <noreply@kde.org>
Thu, 12 Jan 2017 08:42:53 +0000 (12 09:42 +0100)
tree90b430833fec94562e320bef2656fe704a7b2614
parent0f21e1f25d8b1f290376b385e28cb2b689f48826
parent45aa61b6357d6b370a66d4da99a976e598e00fb0
Merge changes from topic 'network-unavailable-and-offline-are-different'

* changes:
  Merge branches 'fetch-binary-cte' and 'network-unavailable-and-offline-are-different'
  GUI: Tweak display of parts that failed to load in WebKit
  Gui: Fix icon name
  GUI: Show accurate error message when a part fails to load in the GUI