]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'alfh/feature_vnstat_1.11' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:16:15 +0000 (23:16 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 Mar 2014 22:16:38 +0000 (23:16 +0100)
1  2 
config/rootfiles/common/vnstat
make.sh

index 57c54dbef6d63c5c189eb2577091ce0e6567beb1,4ddec4a9ce31538d2f1c9361d74ddf9921123e43..faabf47e8ae2041df0c94028574718e7cd46f1f8
@@@ -2,5 -2,11 +2,10 @@@
  #etc/cron.d/vnstat
  etc/vnstat.conf
  usr/bin/vnstat
+ usr/bin/vnstati
+ #usr/sbin/vnstatd
+ #usr/share/man/man5/vnstat.conf.5
+ #usr/share/man/man1/vnstatd.1
+ #usr/share/man/man1/vnstati.1
  #usr/share/man/man1/vnstat.1
  #var/lib/vnstat
 -
diff --cc make.sh
Simple merge