diff options
| author | irungentoo_trip <irungentoo@gmail.com> | 2014-10-31 16:27:51 -0400 |
|---|---|---|
| committer | irungentoo_trip <irungentoo@gmail.com> | 2014-10-31 16:27:51 -0400 |
| commit | d8c5be8c793843b65de04f5178f2287e95092208 (patch) | |
| tree | d28164555f48a9990e072cbfb4561c87dd999c78 /toxcore/LAN_discovery.h | |
| parent | 44f63db6223efe04e6b5f9547c2e47ae5da2d521 (diff) | |
| parent | efad863b27f1cd5dafce794e576f787fad0b74e1 (diff) | |
Merge branch 'master' of https://github.com/tux3/toxcore
#
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Diffstat (limited to 'toxcore/LAN_discovery.h')
0 files changed, 0 insertions, 0 deletions