Merge branch 'develop' into feature/new-splashscreen

Conflicts: manifest.appcache
2015-01-19 11:28:07 +01:00 · 2014-12-08 00:00:49 +01:00 · 2014-12-05 22:37:46 +01:00 · 2014-12-05 21:06:59 +01:00 · 2014-10-22 00:35:48 +02:00 · 2014-09-03 15:31:04 +02:00
7 changed files with 11 additions and 0 deletions
--- a/apple-touch-startup-image-320x460.png
+++ b/apple-touch-startup-image-320x460.png
--- a/apple-touch-startup-image-640x1096.png
+++ b/apple-touch-startup-image-640x1096.png
--- a/apple-touch-startup-image-640x920.png
+++ b/apple-touch-startup-image-640x920.png
--- a/favicon.ico
+++ b/favicon.ico
--- a/index.html
+++ b/index.html
@ -15,6 +15,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <html lang="de" manifest="manifest.appcache">
 <head>
    <link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
    <link rel="apple-touch-startup-image" href="startup-320x460.png" media="screen and (max-device-width : 320px)" />
    <link rel="apple-touch-startup-image" href="startup-640x920.png" media="(max-device-width : 480px) and (-webkit-min-device-pixel-ratio : 2)" />
    <link rel="apple-touch-startup-image" href="startup-640x1096.png" media="(max-device-width : 548px) and (-webkit-min-device-pixel-ratio : 2)">
    <title>Bärneruhr - Die Zeit im Wort</title>
    <meta charset="utf-8"/>
    <meta name="apple-mobile-web-app-capable" content="yes"/>
--- a/manifest.appcache
+++ b/manifest.appcache
@ -23,3 +23,10 @@ resources/settings.png
 resources/uhr.woff
 index.html
 README.md
 VERSION
 apple-touch-icon-precomposed.png
 apple-touch-startup-image-320x460.png
 apple-touch-startup-image-640x1096.png
 apple-touch-startup-image-640x920.png
 favicon.ico
 index.html
--- a/resources/favicon.png
+++ b/resources/favicon.png
Author	SHA1	Message	Date
Manuel Friedli	221874df05	Merge branch 'develop' into feature/new-splashscreen Conflicts: manifest.appcache	2015-01-19 11:28:07 +01:00
Manuel Friedli	fca1b5a01a	Merge branch 'develop' into feature/new-splashscreen	2014-12-08 00:00:49 +01:00
Manuel Friedli	6ad3b1dccb	Merge branch 'develop' into feature/new-splashscreen	2014-12-05 22:37:46 +01:00
Manuel Friedli	e5b9ab35aa	Merge branch 'develop' into feature/new-splashscreen	2014-12-05 21:06:59 +01:00
Manuel Friedli	337fb6f238	Merge branch 'develop' into feature/new-splashscreen	2014-10-22 00:35:48 +02:00
Manuel Friedli	a0ca6228e2	Merge branch 'develop' into feature/new-splashscreen	2014-09-03 15:31:04 +02:00
Manuel Friedli	851c5cbddd	Merge branch 'develop' into feature/new-splashscreen Conflicts: index.html	2014-08-26 18:25:46 +02:00
Manuel Friedli	acbab837c1	updated manifest.appcache	2014-08-26 17:07:16 +02:00
Manuel Friedli	5924f43d99	Merge branch 'master' into feature/new-splashscreen Conflicts: manifest.appcache	2014-08-26 17:06:02 +02:00
Manuel Friedli	ab0d78ae18	updated favicon and added favicon.ico	2014-06-30 15:56:38 +02:00
Manuel Friedli	cbbe2e103d	Merge branch 'develop' into feature/new-splashscreen	2014-06-30 15:49:02 +02:00
Manuel Friedli	8e7029759a	Merge branch 'develop' into feature/new-splashscreen	2014-06-28 16:59:40 +02:00
Manuel Friedli	38ba4bd14b	Merge branch 'develop' into feature/new-splashscreen Conflicts: index.html	2014-06-28 14:22:49 +02:00
Manuel Friedli	4360f5aee1	Merge branch 'develop' into feature/new-splashscreen Conflicts: index.html manifest.appcache	2014-06-28 02:14:50 +02:00
Manuel Friedli	5b8a3bfd22	now trying with HTML meta tags.	2014-06-20 01:37:54 +02:00
Manuel Friedli	dc9768ed2b	updated manifest.appcache	2014-06-20 01:33:21 +02:00
Manuel Friedli	cfb85c26a0	trying different sizes of splash screens	2014-06-20 01:31:23 +02:00
Manuel Friedli	6102097b50	deleted old splash screen	2014-06-20 01:21:04 +02:00
Manuel Friedli	229bf3ef8e	added new splash screens	2014-06-20 01:18:50 +02:00