diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/sane-backends/files/sane-backend-umax.conffiles | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/sane-backends/files/sane-backend-umax.conffiles')
| -rw-r--r-- | package/sane-backends/files/sane-backend-umax.conffiles | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/package/sane-backends/files/sane-backend-umax.conffiles b/package/sane-backends/files/sane-backend-umax.conffiles new file mode 100644 index 000000000..58d34e541 --- /dev/null +++ b/package/sane-backends/files/sane-backend-umax.conffiles @@ -0,0 +1 @@ +/etc/sane.d/umax.conf |