summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-1218-35/+1233
|\
| * Merge pull request #734 from adiabatic/masterErez Zukerman2016-09-113-10/+12
| |\
| | * - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃Nathan Sharfi2016-09-072-10/+12
| | * zweihander: rename to MakefileNathan Sharfi2016-09-071-0/+0
| * | Merge pull request #740 from absenth/developmentErez Zukerman2016-09-113-0/+191
| |\ \
| | * | Updated Image HeaderLars2016-09-081-0/+0
| | * | first commit of Absenth's Ergodox FirmwareLars2016-09-083-0/+191
| * | | Merge pull request #746 from DidierLoiseau/bépoErez Zukerman2016-09-113-0/+944
| |\ \ \
| | * | | Added readme.md for bepo_csaDidier Loiseau2016-09-111-0/+162
| | * | | Fixed compilation issues after the mergeDidier Loiseau2016-09-112-2/+2
| | * | | Merge remote-tracking branch 'remotes/jackhumbert/master' into bépoDidier Loiseau2016-09-116856-2411074/+101831
| | |\ \ \
| | * | | | Added KC_APP on fn+BP_AGRVDidier Loiseau2016-09-111-2/+2
| | * | | | Fix issue #221: LGUI(KC_LSFT) does not workDidier Loiseau2016-04-061-2/+12
| | * | | | Removed D(LSFT) is CSA macrosDidier Loiseau2016-04-061-2/+2
| | * | | | Add delay to CSA macros using dead keysDidier Loiseau2016-04-061-2/+2
| | * | | | Fixed compilation issuesDidier Loiseau2016-04-061-4/+2
| | * | | | Removed remaining ALT_T and CTL_T keysDidier Loiseau2016-04-021-16/+16
| | * | | | Use TG() to switch to BÉPO over CSA, and use KC_TRNS in LR_CSADidier Loiseau2016-04-021-24/+18
| | * | | | Replace Play by temporary num layer with left AltDidier Loiseau2016-04-021-20/+31
| | * | | | BÉPO over CSA: Altgr-shifted layerDidier Loiseau2016-04-021-22/+88
| | * | | | BÉPO over CSA: GR2A-shifted characters in AltGr layerDidier Loiseau2016-04-022-20/+84
| | * | | | BÉPO over CSA: Fixed key repeat for M_NBSPDidier Loiseau2016-04-021-1/+7
| | * | | | Use CSA_ as prefix for Canadian Multilingual key aliasesDidier Loiseau2016-04-022-151/+153
| | * | | | BÉPO over CSA: GR2A characters in AltGr layerDidier Loiseau2016-04-022-15/+88
| | * | | | BÉPO over CSA: unicode supportDidier Loiseau2016-04-021-5/+54
| | * | | | BÉPO over CSA: AltGr layerDidier Loiseau2016-04-022-1/+64
| | * | | | Initial BÉPO over CSA with Shift layerDidier Loiseau2016-04-022-2/+262
| | * | | | Added RESET key on fn-=Didier Loiseau2016-04-021-2/+2
| | * | | | Use enums to define layers and macrosDidier Loiseau2016-04-021-26/+30
| | * | | | Swapped w and = to keep the w on the right hand (better for English)Didier Loiseau2016-04-021-4/+4
| | * | | | Use BÉPO spécific key aliases with BP_ prefixDidier Loiseau2016-04-021-70/+20
| | * | | | Initial bepo layout based on tm2030Didier Loiseau2016-04-021-0/+242
| * | | | | Merge pull request #744 from AlliedEnvy/masterJack Humbert2016-09-111-0/+1
| |\ \ \ \ \
| | * | | | | Use rules.mk template in new project generatorDaniel K. Levy2016-09-101-0/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #743 from shelaf/patch-2Jack Humbert2016-09-113-16/+12
| |\ \ \ \ \
| | * | | | | Variables in Makefile are ignored in rules.mkshela2016-09-113-6/+2
| | * | | | | fix variable value of rules.mkshela2016-09-111-10/+10
| | |/ / / /
| * | | | | Merge pull request #742 from dbordak/masterJack Humbert2016-09-114-8/+72
| |\ \ \ \ \
| | * | | | | Add PCBDOWNDaniel Bordak2016-09-101-0/+4
| | * | | | | Update to new default keymapDaniel Bordak2016-09-102-5/+65
| | * | | | | Fix typoDaniel Bordak2016-09-101-3/+3
| | |/ / / /
| * | | | | Merge pull request #741 from shelaf/patch-1Jack Humbert2016-09-111-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix number of NKRO keysshela2016-09-101-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-1020-44/+1008
|\| | | |
| * | | | Merge pull request #715 from profet23/masterJack Humbert2016-09-094-0/+234
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Changing keymap name to "profet_80"profet232016-09-083-0/+0
| | * | | Removing separate ergodox80 project.profet232016-09-0621-1930/+55
| | * | | Removing/editing non applicable readmeprofet232016-09-024-171/+2
| | * | | Adding 80 Key Ergodox Supportprofet232016-09-0221-0/+2278
| * | | | Merge pull request #739 from pondrejk/masterJack Humbert2016-09-081-0/+0
| |\ \ \ \