mirror of
https://github.com/FoggedLens/iD.git
synced 2026-02-13 17:23:02 +00:00
Squashed commit of the following: commit a100cc377da4d0790582fb2bd69e691d99084f0c Author: Bryan Housel <bryan@7thposition.com> Date: Tue Jun 30 10:26:12 2015 -0400 run make commit cedd5d1c3dd43576ee42a6ab211d2f26eaaa732c Author: jmespadero <josemiguel.espadero@urjc.es> Date: Mon Jun 29 18:53:36 2015 +0200 Update volcano.json commit 38c4a782f6941064f3c8132bce61896ea14e70e9 Author: jmespadero <josemiguel.espadero@urjc.es> Date: Mon Jun 29 16:28:28 2015 +0200 Solver problem in man_made/adit/depth commit 5e6d35dc3ed822ff1716cf0c80e6606545e337bd Author: jmespadero <josemiguel.espadero@urjc.es> Date: Mon Jun 29 16:12:13 2015 +0200 Solver problem in man_made/adit/resource commit bb582143ce90ec00b5d2a7b1efd8fb2415cca16d Author: jmespadero <josemiguel.espadero@urjc.es> Date: Mon Jun 29 13:54:29 2015 +0200 Revert changes to ES locale commit 8537162ad1bc6f6377c90f41cd6f24c103561ca5 Author: jmespadero <josemiguel.espadero@urjc.es> Date: Mon Jun 29 13:50:49 2015 +0200 Some natural and man_made presets commit 4c41d88f63950787ca5372414ebcda4609458d26 Author: jmespadero <josemiguel.espadero@urjc.es> Date: Fri Jun 26 15:57:38 2015 +0200 Some natural/* and man_made/* translations