Merge branch 'master' of ssh://earl@git.ipfire.org/pub/git/ipfire-2.x

This commit is contained in:
Jan Paul Tuecking
2010-07-13 13:13:44 +02:00
26 changed files with 197 additions and 92 deletions

View File

@@ -0,0 +1,3 @@
usr/bin/ddrescue
#usr/share/info/ddrescue.info
#usr/share/man/man1/ddrescue.1

View File

@@ -0,0 +1,26 @@
usr/bin/ascii-xfr
usr/bin/minicom
usr/bin/runscript
usr/bin/xminicom
#usr/share/locale/cs/LC_MESSAGES/minicom.mo
#usr/share/locale/da/LC_MESSAGES/minicom.mo
#usr/share/locale/de/LC_MESSAGES/minicom.mo
#usr/share/locale/es/LC_MESSAGES/minicom.mo
#usr/share/locale/fi/LC_MESSAGES/minicom.mo
#usr/share/locale/fr/LC_MESSAGES/minicom.mo
#usr/share/locale/hu/LC_MESSAGES/minicom.mo
#usr/share/locale/id/LC_MESSAGES/minicom.mo
#usr/share/locale/ja/LC_MESSAGES/minicom.mo
#usr/share/locale/nb/LC_MESSAGES/minicom.mo
#usr/share/locale/pl/LC_MESSAGES/minicom.mo
#usr/share/locale/pt_BR/LC_MESSAGES/minicom.mo
#usr/share/locale/ro/LC_MESSAGES/minicom.mo
#usr/share/locale/ru/LC_MESSAGES/minicom.mo
#usr/share/locale/rw/LC_MESSAGES/minicom.mo
#usr/share/locale/sv/LC_MESSAGES/minicom.mo
#usr/share/locale/vi/LC_MESSAGES/minicom.mo
#usr/share/locale/zh_TW/LC_MESSAGES/minicom.mo
#usr/share/man/man1/ascii-xfr.1
#usr/share/man/man1/minicom.1
#usr/share/man/man1/runscript.1
#usr/share/man/man1/xminicom.1

View File

@@ -1,8 +1,10 @@
etc/watchdog.conf
usr/sbin/watchdog
usr/sbin/wd_identify
usr/sbin/wd_keepalive
#usr/share/man/man5/watchdog.conf.5
#usr/share/man/man8/watchdog.8
#usr/share/man/man8/wd_identify.8
#usr/share/man/man8/wd_keepalive.8
var/ipfire/backup/addons/includes/watchdog
etc/rc.d/init.d/watchdog