diff options
author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
---|---|---|
committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /keyboards/kinesis/docs/photos | |
parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) | |
download | firmware-d889648d5373b7ff77dc7bc4b369c628e8336b45.tar.gz firmware-d889648d5373b7ff77dc7bc4b369c628e8336b45.tar.bz2 firmware-d889648d5373b7ff77dc7bc4b369c628e8336b45.zip |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'keyboards/kinesis/docs/photos')
-rw-r--r-- | keyboards/kinesis/docs/photos/P1050573.jpg | bin | 0 -> 177711 bytes |
-rw-r--r-- | keyboards/kinesis/docs/photos/P1050574.jpg | bin | 0 -> 343978 bytes |
-rw-r--r-- | keyboards/kinesis/docs/photos/P1050575.jpg | bin | 0 -> 266771 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/keyboards/kinesis/docs/photos/P1050573.jpg b/keyboards/kinesis/docs/photos/P1050573.jpg Binary files differnew file mode 100644 index 000000000..027ab9efb --- /dev/null +++ b/keyboards/kinesis/docs/photos/P1050573.jpg diff --git a/keyboards/kinesis/docs/photos/P1050574.jpg b/keyboards/kinesis/docs/photos/P1050574.jpg Binary files differnew file mode 100644 index 000000000..d49c492b8 --- /dev/null +++ b/keyboards/kinesis/docs/photos/P1050574.jpg diff --git a/keyboards/kinesis/docs/photos/P1050575.jpg b/keyboards/kinesis/docs/photos/P1050575.jpg Binary files differnew file mode 100644 index 000000000..50cc9897c --- /dev/null +++ b/keyboards/kinesis/docs/photos/P1050575.jpg |