summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorClint Byrum <clint@fewbar.com>2014-01-31 11:05:09 -0800
committerClint Byrum <clint@fewbar.com>2014-01-31 11:13:22 -0800
commitf9ef45798719254ce66b6374c5f803b04ec86721 (patch)
tree2e22bfd3a5ca5524399f884f980a93251d95b8e0 /Makefile
parent6027346b9bcf7c8c4a4f91dbead6c42d2fefdd3d (diff)
Remove image parameter changing from merge
The merge tool originally was meant to merge somewhat different things, and thus this was helpful in the early versions. However, at this point we want parameters to be more stable and we don't generally merge things that have their own image parameter. Meanwhile this feature caused problems as we change resource names. This is a backward incompatible change of default behavior, but the old behavior can be had again by passing --change-image-params. Change-Id: I78cf31f0443f3d9f274758f5471a5bca9155635d
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions