diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-01-20 22:08:11 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2016-01-20 22:08:11 +0100 |
| commit | e92be2c5fb50736b0b4cd4729fea31f6289c15ed (patch) | |
| tree | 08aca318856117a95a1d6327cdcb882ca1e5a6c2 | |
| parent | c172d3a1047f9b4f2e5cd93bf0008e248cd402e9 (diff) | |
| parent | 14d3bed63b3e51439fbf3632b470729846ca6913 (diff) | |
fix merge conflicts.
| m--------- | hugin | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/hugin b/hugin -Subproject 7e734710be0098ea77ca2d3f54fb626b65bbf47 +Subproject bb7388b685ed043b4a3030da86f7f1e49141477 |