diff options
| author | Brendan Johan Lee <deadcyclo@vanntett.net> | 2017-01-30 12:59:17 +0100 |
|---|---|---|
| committer | Brendan Johan Lee <deadcyclo@vanntett.net> | 2017-01-30 12:59:17 +0100 |
| commit | d43f4a5f57a9f7d9f3080305506d77faf81bf99b (patch) | |
| tree | d0061e0a9352b9d7de7f2730a17dd64fb7bf8ba6 | |
| parent | d7aa4724fbfe51ad016a285797ae664eba5cc150 (diff) | |
| parent | ec05f654210a01ef82db2ab54e6065783536b802 (diff) | |
| download | qmk_firmware-d43f4a5f57a9f7d9f3080305506d77faf81bf99b.tar.gz qmk_firmware-d43f4a5f57a9f7d9f3080305506d77faf81bf99b.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | quantum/keymap_extras/keymap_br_abnt2.h | 16 |
2 files changed, 18 insertions, 2 deletions
@@ -487,7 +487,7 @@ $(SUBPROJECTS): %: %-allkm .PHONY: % %: # Check if we have the CMP tool installed - cmp --version >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; + cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; # Check if the submodules are dirty, and display a warning if they are ifndef SKIP_GIT git submodule status --recursive 2>/dev/null | \ @@ -537,4 +537,4 @@ BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S") $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h) $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h) -include $(ROOT_DIR)/testlist.mk
\ No newline at end of file +include $(ROOT_DIR)/testlist.mk diff --git a/quantum/keymap_extras/keymap_br_abnt2.h b/quantum/keymap_extras/keymap_br_abnt2.h index 0df177721d..b001139dd4 100644 --- a/quantum/keymap_extras/keymap_br_abnt2.h +++ b/quantum/keymap_extras/keymap_br_abnt2.h @@ -1,3 +1,19 @@ +/* Copyright 2017 Potiguar Faga + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #ifndef KEYMAP_BR_ABNT2_H #define KEYMAP_BR_ABNT2_H |