diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-12-26 19:38:19 -0500 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-12-26 19:38:19 -0500 |
| commit | fe57a72659a8a298d8c11f7355d15815dee10195 (patch) | |
| tree | aa3064268b325cb1ceb145cb5a367d1df6c1c4f9 /toxcore/Messenger.h | |
| parent | a4f0b65ad72682e6ca2becf3081f7e5e72a0f7af (diff) | |
| parent | 35602e12c007aec38f65c860cad5f03953c4596d (diff) | |
Merge branch 'http-proxy-feature' of https://github.com/nurupo/InsertProjectNameHere
Diffstat (limited to 'toxcore/Messenger.h')
| -rw-r--r-- | toxcore/Messenger.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/toxcore/Messenger.h b/toxcore/Messenger.h index ae6f54c6..3851edf7 100644 --- a/toxcore/Messenger.h +++ b/toxcore/Messenger.h | |||
| @@ -75,7 +75,6 @@ | |||
| 75 | typedef struct { | 75 | typedef struct { |
| 76 | uint8_t ipv6enabled; | 76 | uint8_t ipv6enabled; |
| 77 | uint8_t udp_disabled; | 77 | uint8_t udp_disabled; |
| 78 | uint8_t proxy_enabled; | ||
| 79 | TCP_Proxy_Info proxy_info; | 78 | TCP_Proxy_Info proxy_info; |
| 80 | } Messenger_Options; | 79 | } Messenger_Options; |
| 81 | 80 | ||