diff options
author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-05 17:50:31 -0700 |
---|---|---|
committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-05 17:50:31 -0700 |
commit | bbfeec2dd7b312745856236214c91fce6b9ec22c (patch) | |
tree | a10fdbe9e941a35ae77cdd1490531b7061dcc6b6 /src/gwin | |
parent | a02c124940b6c5d61ffcbfb2c7e4d493775c3192 (diff) | |
parent | be61787daadcf8cc1e1f307fc48441949e5ec2c0 (diff) | |
download | uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.tar.gz uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.tar.bz2 uGFX-bbfeec2dd7b312745856236214c91fce6b9ec22c.zip |
Merge pull request #28 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'src/gwin')
-rw-r--r-- | src/gwin/button.c | 28 | ||||
-rw-r--r-- | src/gwin/console.c | 34 | ||||
-rw-r--r-- | src/gwin/graph.c | 28 | ||||
-rw-r--r-- | src/gwin/gwin.c | 28 | ||||
-rw-r--r-- | src/gwin/slider.c | 28 |
5 files changed, 18 insertions, 128 deletions
diff --git a/src/gwin/button.c b/src/gwin/button.c index 74fe3080..47c060e1 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -1,30 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file src/gwin/button.c - * @brief GWIN sub-system button code. + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @defgroup Button Button - * @ingroup GWIN - * - * @{ + * http://chibios-gfx.com/license.html */ #include "ch.h" diff --git a/src/gwin/console.c b/src/gwin/console.c index 6720e6b3..13482d25 100644 --- a/src/gwin/console.c +++ b/src/gwin/console.c @@ -1,31 +1,9 @@ -/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
- Joel Bodenmann aka Tectu <joel@unormal.org>
-
- This file is part of ChibiOS/GFX.
-
- ChibiOS/GFX is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- ChibiOS/GFX is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-/**
- * @file src/gwin/console.c
- * @brief GWIN sub-system console code.
- *
- * @defgroup Console Console
- * @ingroup GWIN
- *
- * @{
- */
+/* + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: + * + * http://chibios-gfx.com/license.html + */ #include "ch.h"
#include "hal.h"
diff --git a/src/gwin/graph.c b/src/gwin/graph.c index eff42eb1..05480862 100644 --- a/src/gwin/graph.c +++ b/src/gwin/graph.c @@ -1,30 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file src/gwin/graph.c - * @brief GWIN sub-system button code. + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @defgroup Graph Graph - * @ingroup GWIN - * - * @{ + * http://chibios-gfx.com/license.html */ #include "ch.h" diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 9f009fa1..70cc12ee 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -1,30 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file src/gwin/gwin.c - * @brief GWIN sub-system code. + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @defgroup Window Window - * @ingroup GWIN - * - * @{ + * http://chibios-gfx.com/license.html */ #include "ch.h" diff --git a/src/gwin/slider.c b/src/gwin/slider.c index f535b35c..72421367 100644 --- a/src/gwin/slider.c +++ b/src/gwin/slider.c @@ -1,30 +1,8 @@ /* - ChibiOS/GFX - Copyright (C) 2012, 2013 - Joel Bodenmann aka Tectu <joel@unormal.org> - - This file is part of ChibiOS/GFX. - - ChibiOS/GFX is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - ChibiOS/GFX is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -/** - * @file src/gwin/slider.c - * @brief GWIN sub-system slider code. + * This file is subject to the terms of the GFX License, v1.0. If a copy of + * the license was not distributed with this file, you can obtain one at: * - * @defgroup Slider Slider - * @ingroup GWIN - * - * @{ + * http://chibios-gfx.com/license.html */ #include "ch.h" |