OSDN Git Service

resolve merge conflict
authorWaldemar Brodkorb <wbx@openadk.org>
Thu, 12 Feb 2015 20:03:55 +0000 (14:03 -0600)
committerWaldemar Brodkorb <wbx@openadk.org>
Thu, 12 Feb 2015 20:03:55 +0000 (14:03 -0600)
commitc725f1deaef5bbfb22c83fbfc221a86255a3072b
tree903e5de62bccd2d0e4464f620921b6ab1191e1ff
parentee1800ca1a614fabbeb20ebb6b8c90cc3eaf243b
parentcfdddb3c53213ab6af35364b683de2bf8e8ab05a
resolve merge conflict