| 2013-12-22 |
Jim Morris | Merge branch 'upstreamedge' into upstream-master |
blob | commitdiff | raw |
| 2013-06-12 |
Jim Morris | Merge pull request #174 from wolfmanjm/fix/version... |
blob | commitdiff | raw |
| 2013-06-12 |
Jim Morris | Merge branch 'upstreamedge' into fix/version-makefile |
blob | commitdiff | raw |
| 2013-06-07 |
Jim Morris | Merge remote-tracking branch 'upstream/edge' into featu... |
blob | commitdiff | raw | diff to current |
| 2013-06-07 |
Jim Morris | Use adam greens suggestion to simplify the way the... |
blob | commitdiff | raw |
| 2013-06-07 |
Jim Morris | Merge pull request #173 from wolfmanjm/fix/version... |
blob | commitdiff | raw | diff to current |
| 2013-06-07 |
Jim Morris | Fix makefile so src/version.cpp is copied if on win32 |
blob | commitdiff | raw | diff to current |
| 2013-06-05 |
Logxen | Merge remote-tracking branch 'upstream/edge' into edge |
blob | commitdiff | raw | diff to current |
| 2013-06-05 |
Jim Morris | Update makefile |
blob | commitdiff | raw | diff to current |
| 2013-06-05 |
arthurwolf | Merge pull request #168 from wolfmanjm/feature/add... |
blob | commitdiff | raw | diff to current |
| 2013-05-29 |
Jim Morris | add graceful fail for windows |
blob | commitdiff | raw | diff to current |
| 2013-05-29 |
Jim Morris | Add a version command to simpleshell |
blob | commitdiff | raw | diff to current |
| 2013-05-13 |
Michael Moon | Merge remote-tracking branch 'fix/USBMSD' into edge |
blob | commitdiff | raw | diff to current |
| 2013-03-27 |
Arthur Wolf | merge edge into master |
blob | commitdiff | raw | diff to current |
| 2013-03-16 |
Arthur Wolf | fixing merge conflict |
blob | commitdiff | raw | diff to current |
| 2013-03-05 |
Arthur Wolf | fixing merge conflicts when merging edge back in |
blob | commitdiff | raw | diff to current |
| 2013-03-02 |
Adam Green | Fix for make -j (n>1). |
blob | commitdiff | raw | diff to current |
| 2013-03-02 |
Arthur Wolf | Merge branch 'edge' into extruderfix |
blob | commitdiff | raw | diff to current |
| 2013-03-02 |
Adam Green | Merge remote-tracking branch 'origin/edge' into feature... |
blob | commitdiff | raw | diff to current |
| 2013-03-01 |
Adam Green | Merge remote-tracking branch 'origin/edge' into feature... |
blob | commitdiff | raw | diff to current |
| 2013-02-21 |
Adam Green | Merge remote-tracking branch 'origin/fix/USBSerial... |
blob | commitdiff | raw | diff to current |
| 2013-02-21 |
Ben Gamari | Merge pull request #118 from bgamari/temp-no-irq |
blob | commitdiff | raw | diff to current |
| 2013-02-19 |
Adam Green | Keep memory options together in makefile. |
blob | commitdiff | raw | diff to current |
| 2013-02-18 |
Adam Green | Update to new build system. |
blob | commitdiff | raw | diff to current |
| 2013-02-18 |
Adam Green | Move files in preparation for new build system. |
blob | commitdiff | raw |
| 2013-02-18 |
Adam Green | Merge remote-tracking branch 'origin/edge' into track_a... |
blob | commitdiff | raw | diff to current |
| 2013-02-18 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-17 |
Logxen | Merge branch 'edge' into onboot |
blob | commitdiff | raw | diff to current |
| 2013-02-16 |
Logxen | Merge branch 'edge' into debugbreak |
blob | commitdiff | raw | diff to current |
| 2013-02-16 |
Logxen | Merge branch 'edge' into button |
blob | commitdiff | raw | diff to current |
| 2013-02-14 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-13 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-13 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-13 |
Adam Green | Reserve space for stack at runtime. |
blob | commitdiff | raw | diff to current |
| 2013-02-13 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-11 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-11 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-11 |
Adam Green | WRITE_BUFFER_DISABLE support in makefile. |
blob | commitdiff | raw | diff to current |
| 2013-02-11 |
Adam Green | Merge branch 'edge' into track_allocs |
blob | commitdiff | raw | diff to current |
| 2013-02-10 |
Adam Green | Add heap tagging. |
blob | commitdiff | raw | diff to current |
| 2013-02-05 |
Arthur Wolf | Merge branch 'edge' of github.com:arthurwolf/Smoothie... |
blob | commitdiff | raw | diff to current |
| 2013-02-05 |
Adam Green | Accept outside ENABLE_DEBUG_MONITOR settings. |
blob | commitdiff | raw | diff to current |
| 2013-02-02 |
Arthur Wolf | Merge branch 'edge' of github.com:arthurwolf/Smoothie... |
blob | commitdiff | raw | diff to current |
| 2013-02-01 |
Adam Green | Easier to configure MRI in makefile. |
blob | commitdiff | raw | diff to current |
| 2013-01-24 |
Arthur Wolf | added make dfu, need to merge with existing upload |
blob | commitdiff | raw | diff to current |
| 2013-01-21 |
Michael Moon | Merge bgamari/median into edge |
blob | commitdiff | raw | diff to current |
| 2013-01-20 |
Arthur Wolf | added make dfu |
blob | commitdiff | raw | diff to current |
| 2013-01-06 |
Michael Moon | makefile: flash target to use defined console, and... |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | Merge branch 'hotfix/db35a1-typo' into edge |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | Merge branch 'master' into edge |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | Merge branch 'feature/new-usb-stack' into edge |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | debug most recently uploaded elf instead of most recent... |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | makefile: allow user to change console device easily |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | Makefile: add upload, debug, console targets |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | makefile: add upload target using dfu-util |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | whitespace changes, set USDMSD up to receive USB reset... |
blob | commitdiff | raw | diff to current |
| 2013-01-02 |
Michael Moon | Merge branch 'release/0.1' |
blob | commitdiff | raw | diff to current |
| 2012-11-07 |
Arthur Wolf | corrected interrupt priorities |
blob | commitdiff | raw | diff to current |
| 2012-11-06 |
arthurwolf | Merge pull request #66 from arthurwolf/stepper |
blob | commitdiff | raw | diff to current |
| 2012-11-06 |
Arthur Wolf | stepper branch ready for merging with edge, debug stuff... |
blob | commitdiff | raw | diff to current |
| 2012-10-08 |
Arthur Wolf | solved the block end problem, commiting mostly to save... |
blob | commitdiff | raw | diff to current |
| 2012-09-17 |
Arthur Wolf | merging edge into stepper |
blob | commitdiff | raw | diff to current |
| 2012-09-13 |
Arthur Wolf | re-enabling serial |
blob | commitdiff | raw | diff to current |
| 2012-09-08 |
Arthur Wolf | added -q ( quiet ) option to the play command |
blob | commitdiff | raw | diff to current |
| 2012-08-15 |
Arthur Wolf | merging edge into stepper, correcting conflicts |
blob | commitdiff | raw | diff to current |
| 2012-07-07 |
arthurwolf | Merge pull request #48 from arthurwolf/edge |
blob | commitdiff | raw | diff to current |
| 2012-07-01 |
Arthur Wolf | Merge branch 'edge' into stepper |
blob | commitdiff | raw | diff to current |
| 2012-06-26 |
Arthur Wolf | half-way commit to explain some of what is going on |
blob | commitdiff | raw | diff to current |
| 2012-06-19 |
Arthur Wolf | tested on mbed, seems to work. commiting for Logxen... |
blob | commitdiff | raw | diff to current |
| 2012-06-19 |
Arthur Wolf | First compiling version of the new Config abstraction... |
blob | commitdiff | raw | diff to current |
| 2012-04-30 |
arthurwolf | Merge pull request #20 from adamgreen/edge |
blob | commitdiff | raw | diff to current |
| 2012-04-30 |
Adam Green | Updating mri debug monitor to latest pre-alpha bits. |
blob | commitdiff | raw | diff to current |
| 2012-01-18 |
Arthur Wolf | precaution commit |
blob | commitdiff | raw | diff to current |
| 2011-11-18 |
Arthur Wolf | Changed config system to an object-based one, configs... |
blob | commitdiff | raw | diff to current |
| 2011-09-29 |
Arthur Wolf | Merge branch 'master' into edge |
blob | commitdiff | raw | diff to current |
| 2011-09-29 |
Arthur Wolf | Merging with newer gcc4mbed for better compilability |
blob | commitdiff | raw | diff to current |
| 2011-09-27 |
Arthur Wolf | initial commit |
blob | commitdiff | raw | diff to current |
| 2011-09-19 |
Arthur Wolf | first commit |
blob | commitdiff | raw | diff to current |
|
HCoop / clinton / Smoothieware.git / history