Luke Champine
|
815628b76a
|
make friendlist resize dynamically
|
2013-08-08 10:49:36 -04:00 |
|
irungentoo
|
e8ee3c0cd3
|
Merge pull request #388 from stal888/patch-1
Re-export m_callback_userstatus
|
2013-08-08 06:34:48 -07:00 |
|
irungentoo
|
7d7dd641f9
|
Merge pull request #384 from stqism/master
Adds full -D support to toxics versioning, includes the commit number
|
2013-08-08 06:34:42 -07:00 |
|
irungentoo
|
4e4a7b9e61
|
Merge pull request #391 from JFreegman/master
fix magic numbers in toxic
|
2013-08-08 06:34:35 -07:00 |
|
irungentoo
|
0f63cc2bd4
|
Merge pull request #392 from panosalbanis/master
Added Vim swap files and ctags file
|
2013-08-08 06:34:29 -07:00 |
|
Sean Qureshi
|
4d0cce2f69
|
Merge https://github.com/irungentoo/ProjectTox-Core
|
2013-08-08 03:07:41 -07:00 |
|
Sean Qureshi
|
1bbdd9d2db
|
Merged upstream main.c changes
|
2013-08-08 03:04:36 -07:00 |
|
panosalbanis
|
4efd97a6e2
|
Added Vim swap files and ctags file
|
2013-08-08 10:52:39 +01:00 |
|
Jfreegman
|
0f2b4e5c77
|
oops
|
2013-08-08 04:55:22 -04:00 |
|
Jfreegman
|
6f98fc47b0
|
fix magic numbers
|
2013-08-08 04:51:58 -04:00 |
|
stal
|
0e03b049d8
|
Reinstate semicolon
|
2013-08-07 22:58:39 -07:00 |
|
stal
|
67c2b9fffd
|
Re-export m_callback_userstatus
|
2013-08-07 22:05:23 -07:00 |
|
irungentoo
|
225f74e844
|
Merge pull request #382 from nurupo/master
Separated userstatus_kind from userstatus
|
2013-08-07 19:12:03 -07:00 |
|
Sean Qureshi
|
b3e02d9c9d
|
Adds full -D support to toxics versioning, includes the commit number
|
2013-08-07 18:52:11 -07:00 |
|
Maxim Biro
|
338da1fde7
|
Fixed auto tests
|
2013-08-07 20:37:34 -04:00 |
|
Maxim Biro
|
d72f828d6f
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-07 20:32:47 -04:00 |
|
irungentoo
|
b68c1203f1
|
Merge pull request #383 from stqism/master
Added check to INSTALL.md, the addition of autotests requires it to cmake
|
2013-08-07 17:25:34 -07:00 |
|
Maxim Biro
|
4779561ea3
|
Refactored an expression
|
2013-08-07 20:24:06 -04:00 |
|
Maxim Biro
|
b6a3f2b403
|
Added length checks
|
2013-08-07 20:23:48 -04:00 |
|
Sean Qureshi
|
6a84fd6f0b
|
Added check to INSTALL.md, the addition of autotests requires it
|
2013-08-07 17:01:36 -07:00 |
|
irungentoo
|
f63a89bfc6
|
Merge pull request #381 from CharmlessCoin/auto_tests
Much Needed Tests
|
2013-08-07 16:43:56 -07:00 |
|
Maxim Biro
|
f669b28a6c
|
Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core
Conflicts:
core/Messenger.c
core/Messenger.h
|
2013-08-07 19:18:40 -04:00 |
|
charmlesscoin
|
8b47b6166e
|
jesus, I'm going to sleep after this commit
|
2013-08-07 18:46:48 -04:00 |
|
charmlesscoin
|
8649f86b10
|
removed script changes so _this_ build will pass
|
2013-08-07 18:30:16 -04:00 |
|
irungentoo
|
81fccf68d6
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-07 18:23:26 -04:00 |
|
irungentoo
|
00ecb05c1b
|
Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests
Conflicts:
testing/toxic/prompt.c
|
2013-08-07 18:20:36 -04:00 |
|
irungentoo
|
4dbcfdf05d
|
Some cosmetic improvements.
|
2013-08-07 18:14:35 -04:00 |
|
Maxim Biro
|
b1a2af23e5
|
Modified clients to properly work with the changes
|
2013-08-07 18:12:59 -04:00 |
|
Maxim Biro
|
9801eceaa4
|
Separated StatusMessage from UserStatus
|
2013-08-07 18:12:31 -04:00 |
|
charmlesscoin
|
e47790ce31
|
Fixed the -lCheck issue
|
2013-08-07 17:16:02 -04:00 |
|
charmlesscoin
|
d70b56c10b
|
Travis failed on wget, dummy commit...
|
2013-08-07 16:41:17 -04:00 |
|
charmlesscoin
|
d263824079
|
I suppose adding the FindCheck script would be nice
|
2013-08-07 16:26:07 -04:00 |
|
charmlesscoin
|
0f664f3122
|
Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core into auto_tests
|
2013-08-07 15:22:57 -04:00 |
|
irungentoo
|
dda22a0167
|
Merge pull request #377 from sodwalt/feature
Fixed warnings when compiling nTox_win32
|
2013-08-07 11:30:42 -07:00 |
|
Sean Qureshi
|
3622a5c04c
|
Manually merged prompt.c to upstream
|
2013-08-07 10:57:17 -07:00 |
|
irungentoo
|
59f873fd68
|
Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests
Conflicts:
testing/toxic/chat.c
testing/toxic/prompt.c
|
2013-08-07 13:51:58 -04:00 |
|
Sean Qureshi
|
ece3407c55
|
Moved main.c to maaster
|
2013-08-07 10:36:32 -07:00 |
|
Robert Sutton
|
83112c588a
|
Fix incompatible pointer type warning by changing type of print_statuschange to match parameter of userstatus callback.
|
2013-08-07 13:30:14 -04:00 |
|
Sebastian Stal
|
c0828667e7
|
Document functions, and fix bug.
|
2013-08-07 10:06:07 -07:00 |
|
Sebastian Stal
|
9f6262f3dd
|
Check for correct error value in toxic.
|
2013-08-07 09:57:23 -07:00 |
|
Robert Sutton
|
a102fa7cb0
|
Add #undef before #define to fix redefinition warning
|
2013-08-07 12:54:42 -04:00 |
|
Sebastian Stal
|
105e2fa4a3
|
Add read receipts using packet ID 65.
|
2013-08-07 09:53:52 -07:00 |
|
Sean Qureshi
|
2b916b96bd
|
Fixed it not compiling
|
2013-08-07 09:35:37 -07:00 |
|
irungentoo
|
5a8da17e61
|
Merge branch 'provide-status-type' of https://github.com/jin-eld/ProjectTox-Core into pull-requests
|
2013-08-07 09:11:51 -04:00 |
|
irungentoo
|
0c4788030f
|
Merge branch 'master' of https://github.com/ptrasd/ProjectTox-Core into pull-requests
|
2013-08-07 09:11:41 -04:00 |
|
irungentoo
|
e760c9eeff
|
Merge pull request #360 from DarkSER/master
fixed print_statuschange & m_set_userstatus usage in nTox_win32.c
|
2013-08-07 06:07:44 -07:00 |
|
irungentoo
|
48d7d60a47
|
Merge pull request #370 from JFreegman/master
Fixed two bugs
|
2013-08-07 06:04:11 -07:00 |
|
irungentoo
|
6864e9c931
|
Merge pull request #374 from leeroy2098/master
Don't ignore the result of fwrite. Since we're building with -Wall and -...
|
2013-08-07 06:02:15 -07:00 |
|
Simon Levermann
|
924219b1ab
|
Actually use write_result
|
2013-08-07 13:23:12 +02:00 |
|
Simon Levermann
|
6349ccc97b
|
Don't ignore the result of fwrite. Since we're building with -Wall and -Werror, this causes compile failures.
|
2013-08-07 13:13:04 +02:00 |
|