[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-233-g5361faf
Brought to you by:
sszy
|
From: Fabien M <fa...@us...> - 2011-06-24 08:24:28
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 5361fafbde472338a1ed3993efcca62f112d7d72 (commit)
via 33ae91220a51e27833003f662a24b6469f8d2a40 (commit)
from 9e7b6d578c9baff253d29c8fe6aa5f84f87159cd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5361fafbde472338a1ed3993efcca62f112d7d72
Merge: 33ae91220a51e27833003f662a24b6469f8d2a40 9e7b6d578c9baff253d29c8fe6aa5f84f87159cd
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 24 10:23:40 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 33ae91220a51e27833003f662a24b6469f8d2a40
Author: Fabien Marteau <fab...@ar...>
Date: Fri Jun 24 08:41:08 2011 +0200
[buildroot][package][straton_ios] Artemys nitpick
-----------------------------------------------------------------------
Summary of changes:
target/packages/straton_ios/apf27_ios.c | 2 +-
target/packages/straton_ios/apf51_ios.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/target/packages/straton_ios/apf27_ios.c b/target/packages/straton_ios/apf27_ios.c
index b172a86..a64986d 100755
--- a/target/packages/straton_ios/apf27_ios.c
+++ b/target/packages/straton_ios/apf27_ios.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "apf27_ios.h"
#include <as_gpio.h>
+#include "apf27_ios.h"
static struct as_gpio_device *led;
static struct as_gpio_device *button;
diff --git a/target/packages/straton_ios/apf51_ios.c b/target/packages/straton_ios/apf51_ios.c
index 69337ef..25e3203 100755
--- a/target/packages/straton_ios/apf51_ios.c
+++ b/target/packages/straton_ios/apf51_ios.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include "apf51_ios.h"
#include <as_gpio.h>
+#include "apf51_ios.h"
static struct as_gpio_device *led;
static struct as_gpio_device *button;
hooks/post-receive
--
armadeus
|