From: climbalima Date: Sat, 3 Dec 2016 22:01:26 +0000 (-0500) Subject: Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2186e5ae85aa4cda798b36fd7883d893944ae8a3;p=qmk_firmware.git Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware --- 2186e5ae85aa4cda798b36fd7883d893944ae8a3 diff --cc keyboards/lets_split/imgs/letssplitv2.svg index 000000000,000000000..c7bb1db86 new file mode 100644 --- /dev/null +++ b/keyboards/lets_split/imgs/letssplitv2.svg @@@ -1,0 -1,0 +1,5809 @@@ ++ ++ ++ ++ diff --cc keyboards/maxipad/readme.md index 4e1702c5a,ab7b122fe..606bacd75 --- a/keyboards/maxipad/readme.md +++ b/keyboards/maxipad/readme.md @@@ -1,9 -1,7 +1,16 @@@ ++<<<<<<< HEAD +Maxipad keyboard firmware +====================== + +## Quantum MK Firmware + +For the full Quantum feature list, see [the parent readme.md](/readme.md). ++======= + ## Quantum MK Firmware + + For the full Quantum feature list, see [the parent readme](/). + ++>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 ## Building @@@ -14,14 -10,19 +21,31 @@@ Download or clone the whole firmware an Depending on which keymap you would like to use, you will have to compile slightly differently. ### Default ++<<<<<<< HEAD +To build with the default keymap, simply run `make default`. ++======= + + To build with the default keymap, simply run `make`. + ++>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 ### Other Keymaps +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `.c` and see keymap document (you can find in top readme.md) and existent keymap files. ++<<<<<<< HEAD ++======= + Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files. + ++>>>>>>> a06115df19a74d39b08758472b221e630c3680d3 To build the firmware binary hex file with a keymap just do `make` with a keymap like this: ``` $ make [default|jack|] ``` - Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. ++<<<<<<< HEAD ++Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. ++======= + + Keymaps follow the format **__\.c__** and are stored in the `keymaps` folder. + ++>>>>>>> a06115df19a74d39b08758472b221e630c3680d3