Commit Graph

344 Commits

Author SHA1 Message Date
irungentoo
e6a33fede6 Small inconsistency fixed. 2013-07-26 19:31:01 -04:00
irungentoo
d04f5f40d4 Merge pull request #110 from nfkd/patch-2
Fix braces and some white-spaces
2013-07-26 16:29:35 -07:00
nfkd
4478cd4cd3 Fix braces and some white-spaces 2013-07-26 19:52:20 -03:00
irungentoo
0565374ddc Merge pull request #109 from nfkd/patch-1
Fix braces
2013-07-26 15:49:57 -07:00
irungentoo
2bbffc9ca0 Merge pull request #108 from sometwo/patch-5
styling
2013-07-26 15:42:13 -07:00
nfkd
16c9e23b3c Fix braces 2013-07-26 19:39:04 -03:00
sometwo
db8d47dccb styling
haven't fixed switch statements because I'm lazy
2013-07-26 19:17:24 -03:00
irungentoo
bd48ef52ec Merge pull request #107 from sometwo/patch-4
Fix some indenting
2013-07-26 15:13:44 -07:00
irungentoo
ef2e0c7aad Merge pull request #106 from sometwo/patch-3
Fix braces and a comment
2013-07-26 15:11:29 -07:00
sometwo
a3298d2b9e Fix some indenting 2013-07-26 19:10:22 -03:00
sometwo
a1fd6d53de Fix braces and a comment 2013-07-26 19:05:57 -03:00
irungentoo
056195be41 Fixed the multiple friends request recieved at the same time problem. 2013-07-26 17:06:03 -04:00
irungentoo
9d860fac79 Merge pull request #105 from nfkd/patch-1
Remove unnecessary braces
2013-07-26 10:20:59 -07:00
nfkd
5bfb3957c4 Remove unnecessary braces 2013-07-26 13:25:51 -03:00
irungentoo
e65bedc096 I don't know how this happened. 2013-07-26 10:31:49 -04:00
irungentoo
3d1c77dc57 Added basic Local/LAN discovery. 2013-07-26 10:24:56 -04:00
irungentoo
8c70b7c11d Merge pull request #103 from SilentSand/master
Licensing
2013-07-26 05:38:35 -07:00
SilentSand
1577a1eb61 Minor screwup fixed
I sure wish it was easier to compile on Windows.
2013-07-26 04:08:39 -04:00
SilentSand
59b34e423b Formatting.
Many stylistic changes, mostly formatting code more closely to the
coding style.
2013-07-26 04:02:17 -04:00
SilentSand
b9169ff1b2 Small change 2013-07-26 02:43:38 -04:00
SilentSand
f377eb9ca2 Licensing
Added the GPLv3 license to some files in addition to fixing some
comments at the beginning of the files.
2013-07-25 21:45:56 -04:00
irungentoo
63375b68b6 Broadcast now enabled on socket. 2013-07-25 21:00:31 -04:00
irungentoo
ee331fd73b Experimental and unoptimized symmetric NAT hole punching added. 2013-07-24 19:39:34 -04:00
irungentoo
57e7ed7c10 Merge pull request #99 from Astonex/master
Simple init_networking() error checking
2013-07-24 05:26:03 -07:00
Astonex
92398844a0 Changed the error checking to not just be Windows only 2013-07-24 01:33:08 +01:00
irungentoo
3b53bc3218 Merge pull request #96 from tawm/master
Make the bootstrap daemon configurable
2013-07-23 17:31:08 -07:00
Astonex
de7f72fa56 Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core 2013-07-24 01:23:41 +01:00
Astonex
0af0c274d3 Changed bind() == -1 check to INVALID_SOCK check 2013-07-24 01:22:45 +01:00
Astonex
4398763097 Update rect.py 2013-07-24 00:39:53 +01:00
Astonex
29aa702a4f Added simple init_networking() error checking 2013-07-24 00:32:50 +01:00
Astonex
b7a4c20279 Merge remote-tracking branch 'ProjectTox/master' 2013-07-24 00:32:09 +01:00
irungentoo
ff9e6822ec Merge pull request #98 from notadecent/patch-1
Update README.md
2013-07-23 16:01:04 -07:00
notadecent
53e096c487 Update README.md
Added several links to closely related repo's
2013-07-24 01:00:02 +02:00
tawm
020aa7814f Merge pull request #1 from nurupo/master
Fixed Travis build - thanks a ton, nurupo!
2013-07-23 15:10:58 -07:00
Maxim Biro
27ca0d6c25 Fixed Travis build 2013-07-23 15:41:05 -04:00
irungentoo
2b8d86ebe2 Merge pull request #97 from nurupo/master
Some cleanup
2013-07-23 10:04:05 -07:00
Maxim Biro
ea550d4c86 Some cleanup 2013-07-23 12:23:17 -04:00
Astonex
4aeded2d0e Disregard 2013-07-23 16:17:33 +01:00
irungentoo
0019fe05e5 Merge pull request #94 from nurupo/master
Fixed wspiap.h inclusion
2013-07-23 04:11:56 -07:00
Tom Bartelt
87aad78c87 removed silly test 2013-07-23 06:58:28 -04:00
Tom Bartelt
6f6db8abc0 removed useless header 2013-07-23 06:43:41 -04:00
Tom Bartelt
06eb768a57 Updated server.cfg 2013-07-23 06:39:49 -04:00
Tom Bartelt
ea49be0e95 Fixed a tiny bug 2013-07-23 06:38:35 -04:00
Tom Bartelt
f1ea6024cf renamed init script 2013-07-23 06:32:42 -04:00
Tom Bartelt
9f6f3117bb Update daemon to use config files 2013-07-23 06:28:47 -04:00
Tom Bartelt
413c5810e1 Add libconfig to the build process 2013-07-23 06:25:47 -04:00
Tom Bartelt
a11fa54fa2 Added config file 2013-07-23 06:02:08 -04:00
Maxim Biro
23f13cd95d Fixed include 2013-07-23 03:09:00 -04:00
irungentoo
2cf05862d5 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-07-22 18:19:33 -04:00
irungentoo
e9e9a37867 Merge pull request #91 from nurupo/master
Added support of linkage with C++ code
2013-07-22 15:20:09 -07:00