www

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit b41d645ccdc39d4f0b93faa2206c7c3de6bb32e1
parent b3aba423a7d06491a1fa0054a9c923427d54ed05
Author: John Charron <rm_rf_windows@yahoo.fr>
Date:   Mon, 30 May 2011 23:09:45 +0200

Merge branch 'unstable' of https://github.com/jsmaniac/2011-m1s2-ter into unstable

Diffstat:
Arapport/img/connexion-phone.png | 0
Arapport/img/connexion-web.png | 0
Arapport/img/frontpage-phone-co.png | 0
Arapport/img/frontpage-phone-deco.png | 0
Arapport/img/frontpage-web-co.png | 0
Arapport/img/frontpage-web-deco.png | 0
Arapport/img/info-phone.png | 0
Arapport/img/info-web.png | 0
Arapport/img/jeu-phone.png | 0
Arapport/img/jeu-web.png | 0
Arapport/img/preference-phone.png | 0
Arapport/img/preference-web.png | 0
Arapport/img/score-phone.png | 0
Arapport/img/score-web.png | 0
Arapport/img/splash-phone.png | 0
Arapport/img/splash-web.png | 0
16 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/rapport/img/connexion-phone.png b/rapport/img/connexion-phone.png Binary files differ. diff --git a/rapport/img/connexion-web.png b/rapport/img/connexion-web.png Binary files differ. diff --git a/rapport/img/frontpage-phone-co.png b/rapport/img/frontpage-phone-co.png Binary files differ. diff --git a/rapport/img/frontpage-phone-deco.png b/rapport/img/frontpage-phone-deco.png Binary files differ. diff --git a/rapport/img/frontpage-web-co.png b/rapport/img/frontpage-web-co.png Binary files differ. diff --git a/rapport/img/frontpage-web-deco.png b/rapport/img/frontpage-web-deco.png Binary files differ. diff --git a/rapport/img/info-phone.png b/rapport/img/info-phone.png Binary files differ. diff --git a/rapport/img/info-web.png b/rapport/img/info-web.png Binary files differ. diff --git a/rapport/img/jeu-phone.png b/rapport/img/jeu-phone.png Binary files differ. diff --git a/rapport/img/jeu-web.png b/rapport/img/jeu-web.png Binary files differ. diff --git a/rapport/img/preference-phone.png b/rapport/img/preference-phone.png Binary files differ. diff --git a/rapport/img/preference-web.png b/rapport/img/preference-web.png Binary files differ. diff --git a/rapport/img/score-phone.png b/rapport/img/score-phone.png Binary files differ. diff --git a/rapport/img/score-web.png b/rapport/img/score-web.png Binary files differ. diff --git a/rapport/img/splash-phone.png b/rapport/img/splash-phone.png Binary files differ. diff --git a/rapport/img/splash-web.png b/rapport/img/splash-web.png Binary files differ.