diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/portmap/Makefile | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/portmap/Makefile')
0 files changed, 0 insertions, 0 deletions