diff options
| author | 0312birdzhang <0312birdzhang@gmail.com> | 2015-06-11 09:36:04 +0800 |
|---|---|---|
| committer | 0312birdzhang <0312birdzhang@gmail.com> | 2015-06-11 09:36:04 +0800 |
| commit | 8c18bf7a69c8555c061426948e388fe08be75e18 (patch) | |
| tree | 33659181420ce0f0a4b0bf88aa1a98da3e3c8847 /daemon/uploadmanager.cpp | |
| parent | 82a4611cddcf57d10dd7d25355c9536b3781e9fb (diff) | |
| parent | f926bf8dbb7047f7b51c35a7bb2400a7574102f9 (diff) | |
Merge branch 'master' of https://github.com/0312birdzhang/pebble
Conflicts:
app/translations/pebble-zh_CN.ts
Diffstat (limited to 'daemon/uploadmanager.cpp')
0 files changed, 0 insertions, 0 deletions