summaryrefslogtreecommitdiff
path: root/BSDmakefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-23 12:05:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-23 12:05:38 +0200
commit033e30653835c5c3fc785ab60e6a110203e6241d (patch)
treefbb575df1204e3d44fd1262af721bae206fc848e /BSDmakefile
parent8f3142f161895b5fb02c12d1a4a6e5eec8e861d6 (diff)
resolve merge
Diffstat (limited to 'BSDmakefile')
0 files changed, 0 insertions, 0 deletions