summaryrefslogtreecommitdiff
path: root/include/gnu-versions.h
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-02-12 14:03:55 -0600
committerWaldemar Brodkorb <wbx@openadk.org>2015-02-12 14:03:55 -0600
commitc725f1deaef5bbfb22c83fbfc221a86255a3072b (patch)
tree903e5de62bccd2d0e4464f620921b6ab1191e1ff /include/gnu-versions.h
parentee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b (diff)
parentcfdddb3c53213ab6af35364b683de2bf8e8ab05a (diff)
resolve merge conflict
Diffstat (limited to 'include/gnu-versions.h')
0 files changed, 0 insertions, 0 deletions