Merge branch 'develop' into feature/update-toolchain

This commit is contained in:
Manuel Friedli 2015-01-15 17:23:26 +01:00
commit d0a28a0097
3 changed files with 4 additions and 39 deletions

View file

@ -13,10 +13,10 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html manifest="manifest.appcache">
<html lang="de">
<head>
<title>Bärneruhr - Die Zeit im Wort</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<meta charset="utf-8"/>
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="apple-mobile-web-app-status-bar-style" content="black"/>
<meta name="apple-mobile-web-app-title" content="Bärneruhr"/>

View file

@ -13,10 +13,10 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<html manifest="../manifest.appcache">
<html lang="de">
<head>
<title>Die Zeit im Wort - Informationen</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width,user-scalable=yes,initial-scale=1"/>
<link rel="stylesheet" type="text/css" href="../css/uhr.css"/>
<link rel="stylesheet" type="text/css" href="../css/uhr-black.css" data-class="black"/>

View file

@ -1,35 +0,0 @@
CACHE MANIFEST
# 7.0-next
css/uhr.css
css/uhr-black.css
css/uhr-blue.css
css/uhr-green.css
css/uhr-pink.css
css/uhr-red.css
css/uhr-white.css
css/uhr-yellow.css
info/index.html
info/info.css
js/uhr.js
js/uhr-de.js
js/uhr-de_CH.js
js/uhr-de_CH_genau.js
js/uhr-dk.js
js/uhr-en.js
js/uhr-es.js
js/uhr-fr.js
js/uhr-it.js
js/uhr-nl.js
lib/jquery-2.1.0.min.js
lib/jquery-cookie-1.4.0.js
lib/jquery-ui-1.10.4.custom.min.js
resources/apple-touch-icon-precomposed.png
resources/close.png
resources/favicon.png
resources/settings.png
resources/uhr.woff
COPYING
README.md
VERSION
index.html