| commit | 51513b495278af74982933827430454dfacd2f9a | |
| author | Evgeni Golov <evgeni@golov.de> | |
| Fri, 16 Aug 2013 06:35:44 +0000 (16 08:35 +0200) | ||
| committer | Evgeni Golov <evgeni@golov.de> | |
| Fri, 16 Aug 2013 06:35:44 +0000 (16 08:35 +0200) | ||
| tree | 983d550d0385f4f39524eb41f07c2ee9f5bf83be | treesnapshot (tar.gz zip) |
| parent | 4cf05e71a51a5f68eb2e31886e3677b346995545 | commitdiff |
| parent | ebdf53547a1aa795faa1cd175a52d2c321da5399 | commitdiff |
Merge remote-tracking branch 'origin/new-interfaces'
Conflicts:
src/hdapsd.c
Conflicts:
src/hdapsd.c
| src/hdapsd.c | diff1 | diff2 | blobhistory |
| src/hdapsd.h | diff1 | diff2 | blobhistory |