Code

Bocaj Ergodox Updates#3364

Code

Merged

drashna merged 18 commits intoqmk:masterqmk/qmk_firmware:masterfrom JacobJerrell:masterCopy head branch name to clipboardJul 25, 2018

+561-1

Commits

Commits on Apr 10, 2018

• Bocaj Layout Revamp

  JacobJerrell

  committed
  59c6870

  Copy full SHA for 59c6870

Commits on Apr 11, 2018

• Pull in Upstream (#1)

  Show description for eeba0ce
  JacobJerrell

  authored
  eeba0ce

  Copy full SHA for eeba0ce

• Revert "Pull in Upstream (#1)"

  Show description for b17fa50
  JacobJerrell

  authored
  b17fa50

  Copy full SHA for b17fa50

• Merge pull request #2 from JacobJerrell/revert-1-master

  Show description for 0a945eb
  JacobJerrell

  authored
  0a945eb

  Copy full SHA for 0a945eb

• Merge pull request #3 from qmk/master

  Show description for 9b7e1e9
  JacobJerrell

  authored
  9b7e1e9

  Copy full SHA for 9b7e1e9

Commits on Apr 20, 2018

• Updates to Bocaj Files

  Show description for 3aaab4e
  JacobJerrell

  committed
  3aaab4e

  Copy full SHA for 3aaab4e

Commits on May 19, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  6211b78

  Copy full SHA for 6211b78

Commits on May 31, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  638c005

  Copy full SHA for 638c005

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  850f7c6

  Copy full SHA for 850f7c6

Commits on Jul 10, 2018

• Updates to Bocaj

  Show description for 603f9e2
  JacobJerrell

  committed
  603f9e2

  Copy full SHA for 603f9e2

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  10dd01f

  Copy full SHA for 10dd01f

• Removed 'secrets.h'

  JacobJerrell

  authored
  e106f84

  Copy full SHA for e106f84

• Updates to Bocaj

  Show description for b46a20e
  JacobJerrell

  committed
  b46a20e

  Copy full SHA for b46a20e

• Merge branch 'master' of https://github.com/JacobJerrell/qmk_firmware

  JacobJerrell

  committed
  b94845e

  Copy full SHA for b94845e

Commits on Jul 24, 2018

• Total revisioning of keymap and layout structure

  JacobJerrell

  committed
  cbc7673

  Copy full SHA for cbc7673

• Missed readme.md file

  JacobJerrell

  committed
  59a18c6

  Copy full SHA for 59a18c6

Commits on Jul 25, 2018

• Merge remote-tracking branch 'upstream/master'

  JacobJerrell

  committed
  cb723cc

  Copy full SHA for cb723cc

• Bocaj - Permissive Hold setting enabled

  JacobJerrell

  committed
  9414e91

  Copy full SHA for 9414e91