Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
6738304a
Commit
6738304a
authored
Dec 31, 2015
by
MagoKimbra
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'refs/remotes/origin/master' into dev
parents
b4b87d3b
ebc16d83
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
cardreader.cpp
MarlinKimbra/cardreader.cpp
+1
-1
No files found.
MarlinKimbra/cardreader.cpp
View file @
6738304a
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#include "stepper.h"
#include "stepper.h"
#include "temperature.h"
#include "temperature.h"
#include "ultralcd.h"
#include "ultralcd.h"
#include "nextion_lcd.h"
#include "nextion
/nextion
_lcd.h"
#include "cardreader.h"
#include "cardreader.h"
CardReader
::
CardReader
()
{
CardReader
::
CardReader
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment