diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-11 20:49:33 +0100 |
| commit | 070cac9d32fa7a0f7f4d52eddec901d248cdfae3 (patch) | |
| tree | 1a4cf65e381c5ce777316fb67e69018feb741f8f /package/aufs2-util | |
| parent | d82534d3a6bfb048cc7bdc694654c15a975d7af6 (diff) | |
| parent | 644de656b41be3def5d2d0f276f7e24c0b367ea1 (diff) | |
resolve conflict
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/build.mk
Diffstat (limited to 'package/aufs2-util')
| -rw-r--r-- | package/aufs2-util/Config.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/aufs2-util/Config.in b/package/aufs2-util/Config.in index 4e3b34dcc..f6de6a8b9 100644 --- a/package/aufs2-util/Config.in +++ b/package/aufs2-util/Config.in @@ -3,7 +3,7 @@ config ADK_PACKAGE_AUFS_UTIL tristate default n select ADK_KPACKAGE_KMOD_AUFS_FS + depends on !ADK_HOST_FREEBSD help Utilities for use with aufs2. - http://aufs.sf.net |