diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-08 17:26:57 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-08 17:26:57 +0200 |
commit | 643800cee0ad5b853f06056ff90d24efa670f68c (patch) | |
tree | d873494ef64659d0cd0a836d2e2dd380d585e5c7 /package/base-files/src/etc/passwd | |
parent | 3c70077f308437281c72431223b532f6f427e1d0 (diff) | |
parent | 081830a11721ddc097fd2272d4e7ebd47cb7f8dd (diff) |
Merge remote branch 'phil/auto-config-in'
Conflicts:
Config.in
package/dropbear/Makefile
package/iptables/Makefile
package/kismet/Makefile
package/nfs-utils/Makefile
package/ntpclient/Makefile
package/openvpn/Makefile
package/pkgmaker
package/rxvt-unicode/Makefile
package/vgp/Makefile
package/wpa_supplicant/Makefile
package/xf86-input-keyboard/Makefile
package/xf86-input-mouse/Makefile
Diffstat (limited to 'package/base-files/src/etc/passwd')
0 files changed, 0 insertions, 0 deletions