diff options
| author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
|---|---|---|
| committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-07 21:54:06 +0200 |
| commit | d18df8ef7a7e0528a29fdc96d4843ace54605121 (patch) | |
| tree | 44f75b9bccd3efa130d622736726a5f1c83531f6 /keyboards/bananasplit/Makefile | |
| parent | 308bec28bb76f4305d0f084252d7cf207f1b3d83 (diff) | |
| parent | 933701c2129c0c585ecd8ba37c41b091a7dc687f (diff) | |
| download | qmk_firmware-d18df8ef7a7e0528a29fdc96d4843ace54605121.tar.gz qmk_firmware-d18df8ef7a7e0528a29fdc96d4843ace54605121.zip | |
Merge remote-tracking branch 'upstream/master' into bananasplit
# Conflicts:
# keyboards/bananasplit/Makefile
# keyboards/bananasplit/bananasplit.c
# keyboards/bananasplit/bananasplit.h
# keyboards/bananasplit/config.h
# keyboards/bananasplit/keymaps/default/keymap.c
# keyboards/bananasplit/rules.mk
Diffstat (limited to 'keyboards/bananasplit/Makefile')
| -rw-r--r-- | keyboards/bananasplit/Makefile | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/keyboards/bananasplit/Makefile b/keyboards/bananasplit/Makefile index 687afba30b..57b2ef62e5 100644 --- a/keyboards/bananasplit/Makefile +++ b/keyboards/bananasplit/Makefile @@ -1,18 +1,3 @@ -# Copyright 2017 Balz Guenat -# -# 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 MAKEFILE_INCLUDED include ../../Makefile endif |