diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-24 16:41:04 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-24 16:41:04 +0200 |
| commit | d299e580886353e0813d30f9dee74639f899924a (patch) | |
| tree | e73137e3258538cb5bbc634d1aff24c22e0f7a0f /Makefile | |
| parent | cd9a89257a0004ca18460befc4b141bc07ed5c22 (diff) | |
| parent | cd44abcc588c9fc988589c148e76e4590c2197b8 (diff) | |
| download | qtlocation-mapboxgl-d299e580886353e0813d30f9dee74639f899924a.tar.gz | |
Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
Conflicts:
Makefile
ios/mapbox-gl-cocoa
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -104,5 +104,5 @@ clean: clear_xcode_cache distclean: clean -rm -rf ./mason_packages -.PHONY: mbgl test linux clear_xcode_cache build/test/Makefile +.PHONY: mbgl test linux clear_xcode_cache build/test/Makefile clean distclean # DO NOT DELETE |