forked from benblazak/ergodox-firmware
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- new ergodox website - clarification in licence indicating that parts of the project may not be under that license/copyright - currently the stuff in src/lib, and soon the stuff in contrib, (are|will be) under different copyrights, and possibly different licenses. - also, just so it's written down somewhere: some of my documentation may be considered derivative works of the specs|docs i was taking things from, but i hope i'm safe (fair use?). i tried to make clear in each file where i got stuff though.
- Loading branch information
Showing
3 changed files
with
26 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,13 @@ | ||
# The MIT License (MIT) | ||
Taken from <http://www.opensource.org/licenses/MIT> on 2012-03-10 | ||
Retrieved from <http://www.opensource.org/licenses/MIT> on 2012-03-10 | ||
|
||
This copyright and licence apply to all files in this project, except where | ||
otherwise noted. If you feel that this infringes on any existing intellectual | ||
property, please email me at the address below. | ||
|
||
------------------------------------------------------------------------------- | ||
|
||
Copyright © 2012 Ben Blazak | ||
Copyright © 2012 Ben Blazak <[email protected]> | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
this software and associated documentation files (the "Software"), to deal in | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,15 @@ | ||
-+ set USB vendor ID = 0x1d50 // Openmoko, Inc. | ||
-+ set USB product ID = 0x6028 // ErgoDox ergonomic keyboard | ||
|
||
- link to the [ErgoDox website] (http://ergodox.org/) in toplevel readme.md | ||
// ------- | ||
|
||
- update licence.md with "except when otherwise noted" or something similar, to | ||
-+ link to the [ErgoDox website] (http://ergodox.org/) in toplevel readme.md | ||
|
||
-+ update licence.md with "except when otherwise noted" or something similar, to | ||
reflect the fact that i have code (in src/lib, and contrib) under different | ||
licences, with different authors | ||
|
||
// ------- | ||
|
||
- make new branch and update for fredrick's new PCB (pre-prototype) | ||
|