| commit | 2c8917958da115704507aab835c41c1a4a63664d | |
| author | Waldemar Brodkorb <wbx@openadk.org> | |
| Fri, 28 Jan 2011 19:56:44 +0000 (28 20:56 +0100) | ||
| committer | Waldemar Brodkorb <wbx@openadk.org> | |
| Fri, 28 Jan 2011 19:56:44 +0000 (28 20:56 +0100) | ||
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e | treesnapshot (tar.gz zip) |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 | commitdiff |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac | commitdiff |
resolve conflict
| package/gmediaserver/Makefile | diff1 | diff2 | blobhistory |