diff options
author | Tectu <joel@unormal.org> | 2013-03-07 06:58:15 -0800 |
---|---|---|
committer | Tectu <joel@unormal.org> | 2013-03-07 06:58:15 -0800 |
commit | 93d506ef22faa162007607ff3ea614c981dc1654 (patch) | |
tree | 80bac7750019b5b62ece31564ee8e34e66ceac30 /include | |
parent | e315480c713cb6889c8329788d3dd69c9fbc6cf4 (diff) | |
parent | ce5f3b3d701e7f6ac40fe5e06c5ac32562ba36c7 (diff) | |
download | uGFX-93d506ef22faa162007607ff3ea614c981dc1654.tar.gz uGFX-93d506ef22faa162007607ff3ea614c981dc1654.tar.bz2 uGFX-93d506ef22faa162007607ff3ea614c981dc1654.zip |
Merge pull request #40 from inmarket/master
Merge InMarket Changes
Diffstat (limited to 'include')
-rw-r--r-- | include/gadc/gadc.h | 2 | ||||
-rw-r--r-- | include/gadc/lld/gadc_lld.h | 2 | ||||
-rw-r--r-- | include/gadc/options.h | 2 | ||||
-rw-r--r-- | include/gaudin/lld/gaudin_lld.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/gadc/gadc.h b/include/gadc/gadc.h index 8383b9b8..bd35b30c 100644 --- a/include/gadc/gadc.h +++ b/include/gadc/gadc.h @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013, 2013 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu <joel@unormal.org> This file is part of ChibiOS/GFX. diff --git a/include/gadc/lld/gadc_lld.h b/include/gadc/lld/gadc_lld.h index 4ed4ff17..f9cc8b47 100644 --- a/include/gadc/lld/gadc_lld.h +++ b/include/gadc/lld/gadc_lld.h @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013, 2013 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu <joel@unormal.org> This file is part of ChibiOS/GFX. diff --git a/include/gadc/options.h b/include/gadc/options.h index 95f719e2..87708efe 100644 --- a/include/gadc/options.h +++ b/include/gadc/options.h @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013, 2013 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu <joel@unormal.org> This file is part of ChibiOS/GFX. diff --git a/include/gaudin/lld/gaudin_lld.h b/include/gaudin/lld/gaudin_lld.h index fd1e1b2f..2b2db86e 100644 --- a/include/gaudin/lld/gaudin_lld.h +++ b/include/gaudin/lld/gaudin_lld.h @@ -1,5 +1,5 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013, 2013 + ChibiOS/GFX - Copyright (C) 2012, 2013 Joel Bodenmann aka Tectu <joel@unormal.org> This file is part of ChibiOS/GFX. |