summaryrefslogtreecommitdiff
path: root/xmpp/receivetask.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-11-12 17:59:58 +0000
committerTorne (Richard Coles) <torne@google.com>2014-11-12 17:59:58 +0000
commit2eed1ff3f44fb784dbe3aece06ec6e4781e177f1 (patch)
tree3c7d78d81b4c69cae88708e072ba9eee0bec0257 /xmpp/receivetask.cc
parentce708afc0470244d9ec2e52b28564c62a0f6cd01 (diff)
parentc8429e63ec07341d0055a8f31f66a995d62f8555 (diff)
downloadtalk-master.tar.gz
This commit was generated by merge_to_master.py. Change-Id: Ie97de41dee6631b70dd07c00db5bf3ad4dfe8e14
Diffstat (limited to 'xmpp/receivetask.cc')
0 files changed, 0 insertions, 0 deletions