tree 70f344c8aa6a83f8e3701b7e939a26d5e14f5552
parent 6fe7dccedd0f0d4c1f86e9fd15e0e28cc76fd80a
parent 7448fbe98a929ef1eab8aaad91669ddb4517324b
author David Pursehouse <dpursehouse@collab.net> 1475462835 +0900
committer David Pursehouse <dpursehouse@collab.net> 1475462845 +0900

Merge branch 'stable-2.12'

* stable-2.12:
  Add 'eclipse-out' to the list of ignored folders
  Fix Eclipse project generation

Change-Id: I32545167c8fed5ba5ca8b0a7884a784a3e9f48bb