From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 15 Mar 2011 10:22:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sface
X-Git-Tag: sface-0.1-8~3
X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=dfe08346a978027e3f40f8dbfbe2775527e119a7;hp=a3763f36eadcbf488a72ba60a5c7f7da4ec6e2b3

Merge branch 'master' of ssh://git.onelab.eu/git/sface
---

diff --git a/macos/appIcon.icns b/macos/appIcon.icns
deleted file mode 100644
index bdcf836..0000000
Binary files a/macos/appIcon.icns and /dev/null differ
diff --git a/macos/appIcon.png b/macos/appIcon.png
deleted file mode 100644
index cee980a..0000000
Binary files a/macos/appIcon.png and /dev/null differ
diff --git a/macos/graphic-disk.icns b/macos/graphic-disk.icns
new file mode 100644
index 0000000..431fd8f
Binary files /dev/null and b/macos/graphic-disk.icns differ
diff --git a/macos/background.png b/macos/graphic-install-background.png
similarity index 100%
rename from macos/background.png
rename to macos/graphic-install-background.png
diff --git a/macos/graphic-vol-sface.icns b/macos/graphic-vol-sface.icns
new file mode 100644
index 0000000..c81eadf
Binary files /dev/null and b/macos/graphic-vol-sface.icns differ
diff --git a/macos/graphic-vol-sface.png b/macos/graphic-vol-sface.png
new file mode 100644
index 0000000..49c14c1
Binary files /dev/null and b/macos/graphic-vol-sface.png differ