Commits · e2cd46e45a378979d9b095393b9309223acd7f48 · machinery / MarlinKimbra

14 Feb, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · e2cd46e4
  MagoKimbra authored Feb 14, 2016
  
  e2cd46e4
- Add Kill Method · 88921c5c
  MagoKimbra authored Feb 14, 2016
  
  88921c5c
12 Feb, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · f797d3b4
  MagoKimbra authored Feb 12, 2016
  
  f797d3b4
- Fix Buzzer · 5aa9a277
  MagoKimbra authored Feb 12, 2016
  
  5aa9a277
11 Feb, 2016 4 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 951e0e16
  MagoKimbra authored Feb 11, 2016
  
  951e0e16
- Fix Pin · 8fb8e0b8
  MagoKimbra authored Feb 11, 2016
  
  8fb8e0b8
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · dd7184a2
  MagoKimbra authored Feb 11, 2016
  
  dd7184a2
- Fix Servo · 2e30ce78
  MagoKimbra authored Feb 11, 2016
  
  2e30ce78
10 Feb, 2016 8 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 60c104ef
  MagoKimbra authored Feb 10, 2016
  
  60c104ef
- Update Nextion v0_6_3 · acf4e5ea
  MagoKimbra authored Feb 10, 2016
  
  acf4e5ea
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 2bd841fa
  MagoKimbra authored Feb 10, 2016
  
  2bd841fa
- Fix · 3bef039c
  MagoKimbra authored Feb 10, 2016
  
  3bef039c
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 1df12c66
  MagoKimbra authored Feb 10, 2016
  
  1df12c66
- Fix configuration_pins · 32428ef9
  MagoKimbra authored Feb 10, 2016
  
  32428ef9
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · a963b96f
  MagoKimbra authored Feb 10, 2016
  
  a963b96f
- Fix Servo · 9d4d7643
  MagoKimbra authored Feb 10, 2016
  
  9d4d7643
09 Feb, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/dev' · 6bb5dd51
  MagoKimbra authored Feb 09, 2016
  
  6bb5dd51
- Update V4.2.5 · a5ec7e53
  MagoKimbra authored Feb 09, 2016
  
  a5ec7e53
07 Feb, 2016 5 commits
- Update SD · fc2d65a2
  MagoKimbra authored Feb 07, 2016
  
  fc2d65a2
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · f076bcb0
  MagoKimbra authored Feb 07, 2016
  
  f076bcb0
- Fix cardreader.cpp · d344f75a
  MagoKimbra authored Feb 07, 2016
  
  d344f75a
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · ea7977b1
  MagoKimbra authored Feb 07, 2016
  
  ea7977b1
- Fix sanitycheck · dcca8c7e
  MagoKimbra authored Feb 07, 2016
  
  dcca8c7e
06 Feb, 2016 2 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 830a4db8
  MagoKimbra authored Feb 06, 2016
  
  830a4db8
- Update 4.2.5 · e9637253
  MagoKimbra authored Feb 06, 2016
  
  e9637253
05 Feb, 2016 15 commits
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · 69eec560
  MagoKimbra authored Feb 05, 2016
  
  69eec560
- Update Compilation.md · 82a14412
  MagoKimbra authored Feb 05, 2016
  
  82a14412
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev · f000341e
  MagoKimbra authored Feb 05, 2016
  
  f000341e
- Update V4.2.5 · 33d74bc9
  MagoKimbra authored Feb 05, 2016
  
  33d74bc9
- Merge remote-tracking branch 'origin/master' · 0e0b0074
  MagoKimbra authored Feb 05, 2016
```
# Conflicts:
#	README.md
```
  0e0b0074
- Merge remote-tracking branch 'refs/remotes/origin/dev' · 607484aa
  MagoKimbra authored Feb 05, 2016
  
  607484aa
- Update 4.2.5 · 191024a3
  MagoKimbra authored Feb 05, 2016
  
  191024a3
- Update 4.2.5 · b68b56b6
  MagoKimbra authored Feb 05, 2016
  
  b68b56b6
- Update 4.2.5 · b0be8de5
  MagoKimbra authored Feb 05, 2016
  
  b0be8de5
- Update README.md · a8abdd0b
  MagoKimbra authored Feb 05, 2016
  
  a8abdd0b
- Update README.md · 8563a5f5
  MagoKimbra authored Feb 05, 2016
  
  8563a5f5
- Update README.md · feeb739b
  MagoKimbra authored Feb 05, 2016
  
  feeb739b
- Update changelog.md · 733f812a
  MagoKimbra authored Feb 05, 2016
  
  733f812a
- Update README.md · 1950b048
  MagoKimbra authored Feb 05, 2016
  
  1950b048
- Update 4.2.5 · 66a73180
  MagoKimbra authored Feb 05, 2016
  
  66a73180