summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Android api 17 compatLeith Bade2014-11-153-3/+4
* Give Travis latest build toolsLeith Bade2014-11-154-4/+4
* Update to new build toolsLeith Bade2014-11-152-2/+2
* Make Travis load submodules in initLeith Bade2014-11-151-0/+3
* Revert "Travis needs submodules too"Leith Bade2014-11-151-1/+0
* Fix some lint errorsLeith Bade2014-11-153-8/+1
* Change to proper Log functionsLeith Bade2014-11-154-289/+271
* Add missing apt-get to Linux instructionsLeith Bade2014-11-151-0/+1
* Travis needs submodules tooLeith Bade2014-11-141-0/+1
* Revert "Ensure error when the styles submodule is not loaded"Justin R. Miller2014-11-131-1/+0
* Revert "Fix Makefile"Justin R. Miller2014-11-132-3/+1
* Fix MakefileLeith Bade2014-11-142-1/+3
* Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-141-0/+1
|\
| * Merge pull request #600 from mapbox/png-other-ldflagsMike Morris2014-11-131-0/+1
| |\
| | * pass png_static_libs to other_ldflags in install.gypi on Linux, closes #581Mike Morris2014-11-131-0/+1
| |/
* | Implement connectivity monitoringLeith Bade2014-11-144-13/+90
* | Ensure error when the styles submodule is not loadedLeith Bade2014-11-131-0/+1
* | fix typoJustin R. Miller2014-11-121-1/+1
* | refs #556: OS X Android build instructionsJustin R. Miller2014-11-121-0/+16
* | tabs -> spacesJustin R. Miller2014-11-121-20/+20
* | indicate submodule setup in common header of install infoJustin R. Miller2014-11-121-6/+6
* | Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into andro...Justin R. Miller2014-11-121-16/+23
|\ \
| * | Scale map style to match screen DPILeith Bade2014-11-131-16/+23
* | | formatting tweaksJustin R. Miller2014-11-121-7/+7
|/ /
* | add default, unburned icons to satisfy StudioJustin R. Miller2014-11-124-0/+0
* | Merge branch 'android-mason' of github.com:mapbox/mapbox-gl-native into andro...Justin R. Miller2014-11-1220-223/+317
|\ \
| * | Fix crashLeith Bade2014-11-122-2/+2
| * | Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-masonLeith Bade2014-11-126-4/+88
| |\ \ | | |/
| | * check library versions against header symbols in static initialization functionKonstantin Käfer2014-11-123-0/+84
| | * Merge pull request #583 from mapbox/glx-undef-noneMike Morris2014-11-113-4/+4
| | |\
| | | * repair undef None GLX wrapper, pass 0 instead of None to GLX functionsMike Morris2014-11-103-4/+4
| | |/
| * | More tidy upLeith Bade2014-11-121-10/+4
| * | Add noncopyableLeith Bade2014-11-123-3/+6
| * | Tidy code up moreLeith Bade2014-11-123-145/+131
| * | Renamed source files using mapbox styleLeith Bade2014-11-128-48/+61
| * | Lets no get ahead of ourselvesLeith Bade2014-11-122-2/+2
| * | Missed other Map::terminate() callLeith Bade2014-11-111-1/+1
| * | Change Assetbridge extraction dir to data dirLeith Bade2014-11-116-13/+29
| * | Fix function nameLeith Bade2014-11-111-1/+1
| * | We no longer need to call Map::terminate9Leith Bade2014-11-111-1/+1
| * | Be sure to terminate everythingLeith Bade2014-11-111-0/+2
| * | Remove left over test logsLeith Bade2014-11-111-4/+0
* | | add dev icon burningJustin R. Miller2014-11-116-1/+24
* | | rename iconsJustin R. Miller2014-11-115-1/+1
* | | update app iconsJustin R. Miller2014-11-114-0/+0
* | | use remote style URLJustin R. Miller2014-11-111-2/+2
|/ /
* | Fix flixker after switchLeith Bade2014-11-104-15/+27
* | Remove old commentsLeith Bade2014-11-101-6/+0
* | Actually remove read fillLeith Bade2014-11-091-2/+2
* | Wait for pauseLeith Bade2014-11-094-65/+47