Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into asterisk-update

This commit is contained in:
Dirk Wagner
2014-09-12 23:29:32 +02:00
60 changed files with 1208 additions and 88 deletions

View File

@@ -1,3 +1,15 @@
etc/rc.d/init.d/minidlna
etc/minidlna.conf
usr/sbin/minidlna
usr/sbin/minidlnad
#usr/share/locale/da/LC_MESSAGES/minidlna.mo
#usr/share/locale/de/LC_MESSAGES/minidlna.mo
#usr/share/locale/es/LC_MESSAGES/minidlna.mo
#usr/share/locale/fr/LC_MESSAGES/minidlna.mo
#usr/share/locale/it/LC_MESSAGES/minidlna.mo
#usr/share/locale/ja/LC_MESSAGES/minidlna.mo
#usr/share/locale/nb/LC_MESSAGES/minidlna.mo
#usr/share/locale/nl/LC_MESSAGES/minidlna.mo
#usr/share/locale/pl/LC_MESSAGES/minidlna.mo
#usr/share/locale/ru/LC_MESSAGES/minidlna.mo
#usr/share/locale/sl/LC_MESSAGES/minidlna.mo
#usr/share/locale/sv/LC_MESSAGES/minidlna.mo

View File

@@ -9944,14 +9944,14 @@ srv/web/owncloud
#srv/web/owncloud/core/img/favicon.png
#srv/web/owncloud/core/img/favicon.svg
#srv/web/owncloud/core/img/filetypes
#srv/web/owncloud/core/img/filetypes/application-epub#zip.png
#srv/web/owncloud/core/img/filetypes/application-epub#zip.svg
#srv/web/owncloud/core/img/filetypes/application-epub+zip.png
#srv/web/owncloud/core/img/filetypes/application-epub+zip.svg
#srv/web/owncloud/core/img/filetypes/application-javascript.png
#srv/web/owncloud/core/img/filetypes/application-javascript.svg
#srv/web/owncloud/core/img/filetypes/application-pdf.png
#srv/web/owncloud/core/img/filetypes/application-pdf.svg
#srv/web/owncloud/core/img/filetypes/application-rss#xml.png
#srv/web/owncloud/core/img/filetypes/application-rss#xml.svg
#srv/web/owncloud/core/img/filetypes/application-rss+xml.png
#srv/web/owncloud/core/img/filetypes/application-rss+xml.svg
#srv/web/owncloud/core/img/filetypes/application-x-cbr.png
#srv/web/owncloud/core/img/filetypes/application-x-cbr.svg
#srv/web/owncloud/core/img/filetypes/application-x-shockwave-flash.png
@@ -9976,8 +9976,8 @@ srv/web/owncloud
#srv/web/owncloud/core/img/filetypes/folder.svg
#srv/web/owncloud/core/img/filetypes/font.png
#srv/web/owncloud/core/img/filetypes/font.svg
#srv/web/owncloud/core/img/filetypes/image-svg#xml.png
#srv/web/owncloud/core/img/filetypes/image-svg#xml.svg
#srv/web/owncloud/core/img/filetypes/image-svg+xml.png
#srv/web/owncloud/core/img/filetypes/image-svg+xml.svg
#srv/web/owncloud/core/img/filetypes/image.png
#srv/web/owncloud/core/img/filetypes/image.svg
#srv/web/owncloud/core/img/filetypes/package-x-generic.png

View File

@@ -1,13 +1,14 @@
etc/fcron.hourly/squid-accounting
var/log/accounting.log
srv/web/ipfire/cgi-bin/accounting.cgi
#srv/web/ipfire/html/accounting
srv/web/ipfire/html/accounting/logo
usr/local/bin/acct.pl
var/ipfire/accounting
var/ipfire/accounting/dbinstall.pl
var/ipfire/accounting/bill
var/ipfire/accounting/acct-lib.pl
var/ipfire/accounting/bill
var/ipfire/accounting/dbinstall.pl
var/ipfire/addon-lang/acct.de.pl
var/ipfire/addon-lang/acct.en.pl
var/ipfire/menu.d/EX-squid-accounting.menu
var/ipfire/backup/addons/includes/squid-accounting
var/ipfire/menu.d/EX-squid-accounting.menu
var/log/accounting.log