[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-358-gf53b3b7

[Fabien M <fa...@us...>]

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  f53b3b7132d60d12a6287891a5ce874df6d274db (commit)
       via  43c0a940cb7cda1fec60116da6c9f220ecb1a5c6 (commit)
      from  53d60476b9fd0481ffd82bef2eac1c61bd5f94db (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 f53b3b7132d60d12a6287891a5ce874df6d274db
Merge: 43c0a940cb7cda1fec60116da6c9f220ecb1a5c6 53d60476b9fd0481ffd82bef2eac1c61bd5f94db
Author: Fabien Marteau <fab...@ar...>
Date:   Thu May 20 15:51:59 2010 +0200

    Merge branch 'master' of git://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 43c0a940cb7cda1fec60116da6c9f220ecb1a5c6
Author: Fabien Marteau <fab...@ar...>
Date:   Thu May 20 15:51:39 2010 +0200

    Adding image to test lcd

-----------------------------------------------------------------------

Summary of changes:
 target/test/data/images/mire_480x270.png |  Bin 0 -> 1999 bytes
 target/test/data/images/mire_800x480.png |  Bin 0 -> 2725 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 target/test/data/images/mire_480x270.png
 create mode 100644 target/test/data/images/mire_800x480.png

diff --git a/target/test/data/images/mire_480x270.png b/target/test/data/images/mire_480x270.png
new file mode 100644
index 0000000..c11a891
Binary files /dev/null and b/target/test/data/images/mire_480x270.png differ
diff --git a/target/test/data/images/mire_800x480.png b/target/test/data/images/mire_800x480.png
new file mode 100644
index 0000000..4dd4e63
Binary files /dev/null and b/target/test/data/images/mire_800x480.png differ


hooks/post-receive
-- 
armadeus