SVN merge with latest changes in trunk.

This commit is contained in:
2014-09-24 09:05:59 +00:00
Notes: subgit 2018-03-07 17:59:07 +01:00
r768 www/branches/life
7 changed files with 225 additions and 12 deletions

4
.gitattributes vendored
View File

@@ -5,7 +5,9 @@ www/copyright.inc.de -text
www/external/TileLayer.Grayscale.js -text
www/external/css/dvf.css -text
www/external/css/leaflet.label.css -text
www/external/easyPrint.css -text
www/external/first.png -text
www/external/jQuery.print.js -text
www/external/jquery.localtime-0.9.1.min.js -text
www/external/jquery.tablesorter.min.js -text
www/external/jquery.tablesorter.pager.css -text
@@ -14,10 +16,12 @@ www/external/jquery.tablesorter.widgets.min.js -text
www/external/last.png -text
www/external/leaflet-dvf.markers.min.js -text
www/external/leaflet.css -text
www/external/leaflet.easyPrint.js -text
www/external/leaflet.js -text
www/external/leaflet.label.js -text
www/external/next.png -text
www/external/prev.png -text
www/external/print.png -text
www/external/sprintf.min.js -text
www/external/theme.blue.css -text
www/external/widget-pager.js -text