projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge in latest trunk.
[pub/USBasp.git]
/
Projects
/
TempDataLogger
/
Lib
/
DataflashManager.h
diff --git
a/Projects/TempDataLogger/Lib/DataflashManager.h
b/Projects/TempDataLogger/Lib/DataflashManager.h
index
909eefc
..
5d598ca
100644
(file)
--- a/
Projects/TempDataLogger/Lib/DataflashManager.h
+++ b/
Projects/TempDataLogger/Lib/DataflashManager.h
@@
-7,7
+7,7
@@
*/
/*
*/
/*
- Copyright 201
1
Dean Camera (dean [at] fourwalledcubicle [dot] com)
+ Copyright 201
2
Dean Camera (dean [at] fourwalledcubicle [dot] com)
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
Permission to use, copy, modify, distribute, and sell this
software and its documentation for any purpose is hereby granted
@@
-39,8
+39,8
@@
/* Includes: */
#include <avr/io.h>
/* Includes: */
#include <avr/io.h>
- #include "TempDataLogger.h"
- #include "Descriptors.h"
+ #include "
../
TempDataLogger.h"
+ #include "
../
Descriptors.h"
#include <LUFA/Common/Common.h>
#include <LUFA/Drivers/USB/USB.h>
#include <LUFA/Common/Common.h>
#include <LUFA/Drivers/USB/USB.h>