tree e84250ca95e3fe6d88ac9d5695d0d5e0b37b4479
parent 62aa97934bab1ab0c5cb68eb8d4b4619529cd305
parent e62c118d29db060d681ef3fac108fa56cfc843ca
author David Pursehouse <dpursehouse@collab.net> 1557823292 +0200
committer David Pursehouse <dpursehouse@collab.net> 1557823292 +0200

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Adapt Eclipse project generation for Bazel 0.25

Change-Id: I03ab4b39f5255cfb1e2bf7043a55b9a526d6012b