Merge remote-tracking branch 'ms/timezone-transision' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Jan 2014 13:40:53 +0000 (14:40 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 29 Jan 2014 13:40:53 +0000 (14:40 +0100)
1  2 
config/rootfiles/common/stage2

index a7966241613ed64194a2e5845e0c99c83deddccf,3caa839fb20d030da8d59993d02d53a8e61abe4a..45aaa8a7d950d70dcbb82e33477d2007ae697192
@@@ -66,9 -66,6 +66,9 @@@ root/ipfir
  #usr/bin/perl
  #usr/include
  #usr/lib
 +usr/lib/firewall
 +usr/lib/firewall/firewall-lib.pl
 +usr/lib/firewall/rules.pl
  #usr/lib/libgcc_s.so
  usr/lib/libgcc_s.so.1
  #usr/lib/libstdc++.la
@@@ -94,6 -91,7 +94,7 @@@ usr/local/bin/scanh
  usr/local/bin/setddns.pl
  usr/local/bin/settime
  usr/local/bin/timecheck
+ use/local/bin/timezone-transition
  #usr/local/bin/uname
  usr/local/bin/update-lang-cache
  #usr/local/include