~gerboland/qtubuntu/adopt-more-eglconvenience2

Viewing all changes in revision 341.

  • Committer: Gerry Boland
  • Date: 2016-06-03 09:55:43 UTC
  • mfrom: (316.2.5 qtubuntu)
  • Revision ID: gerry.boland@canonical.com-20160603095543-lcahxd8zt3hdy7pj
Merge trunk, fix conflicts, give hints to branch predictor

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: