Skip to content

Commit

Permalink
Merge remote-tracking branch 'ndt-neo/neo2--ndt' into Neo_SaSu
Browse files Browse the repository at this point in the history 
Conflicts:
	makefile
	readme.md
	src/keyboard/ergodox/controller/mcp23018.md
	src/lib-other/pjrc/usb_keyboard/usb_keyboard.c
	src/lib-other/pjrc/usb_keyboard/usb_keyboard.h
	src/lib/key-functions/private.c
	src/lib/key-functions/private.h
	src/lib/key-functions/public.h
	src/lib/key-functions/public/basic.c
	src/lib/key-functions/public/special.c
	src/lib/usb/usage-page/keyboard.h
	src/main.c
	src/main.h
	src/makefile
  • Loading branch information
@xstable
xstable committed Dec 14, 2014
2 parents 9253e51 + a589795 commit 5adc03f
Show file tree
Hide file tree
Showing 115 changed files with 9,705 additions and 5,630 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/local - *
*.*~

Loading

0 comments on commit 5adc03f

Please sign in to comment.