Ignore changes in submodules. #940
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ignore local library files.
Merged
johndoe8967
added a commit
to johndoe8967/Sming
that referenced
this pull request
Feb 18, 2017
* commit '4e20be51ca1ec3ab16f74963e970020363361d00': (60 commits) Do makefile reload only once. (SmingHub#964) If there is a need for a custom host compiler and linker, then (SmingHub#967) Docker: Faster build time: Fetch pre-compiled toolchain instead of compilin… (SmingHub#955) spiffs_mount: Fixed the start block calculation. (SmingHub#961) Fix spiffs_mount() to work correctly. (SmingHub#958) Added UDK build badge. CI: Fix for project id. (SmingHub#959) Initial Windows UDK support. (SmingHub#956) Fixed issues with custom LWIP compilation and C++11 standard. (SmingHub#951) Make SystemClockClass::setTime to work accordingly to timezone settings. (SmingHub#949) Fixed `Makefile-project.mk` (SmingHub#950) Added debugf settings also for rBoot based projects. (SmingHub#947) Moved the rboot linker file to the library ld folder. (SmingHub#948) Preparation for release 3.1.0. (SmingHub#935) Fixes to third-party-clean target. (SmingHub#943) Ignore changes in submodules. (SmingHub#940) * Fix whitespace issue (SmingHub#939) Added two targets: (SmingHub#934) small fixes fix section type error;make options can be set;documentation ...
johndoe8967
added a commit
to johndoe8967/Sming
that referenced
this pull request
Feb 18, 2017
* commit 'b0568b58db7d63d1078b29eea721554338932bc1': (227 commits) Third-party: LWIP & rBoot updates. Preparation for hotfix release 3.1.1. Synched the LWIP code changes with `develop`. spiffs_mount: Fixed the start block calculation. (SmingHub#961) Fix spiffs_mount() to work correctly. (SmingHub#958) Added UDK build badge. CI: Fix for project id. (SmingHub#959) Initial Windows UDK support. (SmingHub#956) Fixed issues with custom LWIP compilation and C++11 standard. (SmingHub#951) Make SystemClockClass::setTime to work accordingly to timezone settings. (SmingHub#949) Fixed `Makefile-project.mk` (SmingHub#950) Added axTLS changes related to SDK 2.0. Added LWIP source code. In the master branch the remote submodules are already fetched and patched for easy use from all users. Preparation for release 3.1.0. (SmingHub#935) Fixes to third-party-clean target. (SmingHub#943) Ignore changes in submodules. (SmingHub#940) * Fix whitespace issue (SmingHub#939) Added two targets: (SmingHub#934) Added axTLS changes related to SDK 2.0. ... # Conflicts: # .travis.yml # Sming/SmingCore/Digital.h # Sming/SmingCore/HardwareTimer.cpp # Sming/SmingCore/HardwareTimer.h
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ignore local library files.