diff options
| author | David Crocker <dcrocker@eschertech.com> | 2014-06-28 20:58:03 +0400 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2014-06-28 20:58:03 +0400 |
| commit | 9e1ad597a4f7f1efec11afdc1010cdd1d17d5555 (patch) | |
| tree | 94198b38e10a580b763513fe0c254742282d77d2 /.gitignore | |
| parent | 668a46ce18378c30e278b854cc5ebf8162889018 (diff) | |
| parent | 415932bc0338e27f141f0491d16499aa3434a363 (diff) | |
Merge branch 'duet'
Conflicts:
.gitignore
Configuration.h
GCodes.cpp
GCodes.h
Heat.cpp
Heat.h
Move.cpp
Move.h
Platform.cpp
Platform.h
RepRapFirmware.cpp
RepRapFirmware.h
Reprap.h
SD-image/sys/config.g
Webserver.cpp
Webserver.h
network/ethernet_sam.c
network/ethernet_sam.h
network/httpd.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -4,5 +4,8 @@ Release/* !Release/RepRapFirmware*.bin *~ *orig +<<<<<<< HEAD /Release +======= +>>>>>>> duet |