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/srelay/Makefile | |
| 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/srelay/Makefile')
0 files changed, 0 insertions, 0 deletions