diff options
author | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 08:05:18 +0200 |
---|---|---|
committer | Michael Vogt <mvo@ubuntu.com> | 2014-10-08 08:05:18 +0200 |
commit | 676700504710013d6737f79bf6ad12003d55c30d (patch) | |
tree | 4b5713e0c880750b35ee7f5ba9285917361e4926 /methods/server.cc | |
parent | ee27950632c149bb14c9c490e92147579ba4fc2a (diff) | |
parent | f9a3c4bde867e70e8c89b6ed5924ab9fab517096 (diff) |
Merge remote-tracking branch 'donkult/feature/acq-trans' into feature/expected-size
Diffstat (limited to 'methods/server.cc')
0 files changed, 0 insertions, 0 deletions