summaryrefslogtreecommitdiff
path: root/protocols/Tox/src/tox_menus.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-08-27 21:31:57 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-08-27 21:31:57 +0000
commit18fb3c2f6c84e3242df27a8686da95658584f7a8 (patch)
tree85b137147f5050862c33afc84bc5fa003606856b /protocols/Tox/src/tox_menus.cpp
parent5d7ce04b05778bdd989b6744b300c0f65ed94624 (diff)
name conflicts resolved
git-svn-id: http://svn.miranda-ng.org/main/trunk@15050 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_menus.cpp')
0 files changed, 0 insertions, 0 deletions