Jfreegman
|
a91aee0a9f
|
Merge remote-tracking branch 'upstream/master' into testing
|
2013-08-05 13:42:15 -04:00 |
|
Nominate
|
39545a92da
|
Added a 'clear' function to the prompt
|
2013-08-05 18:33:16 +01:00 |
|
joshuaj
|
bafd996e72
|
Fixed toxic friends list flicker
|
2013-08-05 10:14:44 -07:00 |
|
irungentoo
|
dc3fe775fc
|
Merge pull request #334 from lukechampine/master
temporary fix to prevent m_addfriend from segfaulting
|
2013-08-05 08:32:44 -07:00 |
|
Luke Champine
|
d1f84efdd7
|
temporary fix to prevent m_addfriend from segfaulting
|
2013-08-05 11:22:47 -04:00 |
|
irungentoo
|
519e22677a
|
Merge pull request #312 from Niautanor/master
fix for Issue #288
|
2013-08-05 07:19:50 -07:00 |
|
irungentoo
|
dc70dafb0d
|
Merge pull request #333 from fhahn/void-parameters
Use void for functions with no parameters
|
2013-08-05 07:09:47 -07:00 |
|
Florian Hahn
|
5617bf0bf1
|
Use void for functions with no parameters
|
2013-08-05 15:57:17 +02:00 |
|
Jfreegman
|
29880b4299
|
init array
|
2013-08-05 02:48:59 -04:00 |
|
Jfreegman
|
17f121c58e
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing
|
2013-08-05 02:33:15 -04:00 |
|
Jfreegman
|
e479f338c1
|
test
|
2013-08-05 02:32:50 -04:00 |
|
Jfreegman
|
3bc7f15fe5
|
added ability to close and reopen chat windows & other minor changes
|
2013-08-05 01:57:29 -04:00 |
|
irungentoo
|
5e43dc7bd8
|
Merge pull request #331 from nurupo/master
cmake improvements
|
2013-08-04 19:49:08 -07:00 |
|
Maxim Biro
|
ca3380ba2f
|
Added cmake options into INSTALL
|
2013-08-04 22:43:45 -04:00 |
|
Maxim Biro
|
03a2bac319
|
Improved cmake
|
2013-08-04 22:25:07 -04:00 |
|
irungentoo
|
c1e4365d1d
|
Merge pull request #330 from nurupo/master
Fixed Windows build
|
2013-08-04 18:26:04 -07:00 |
|
Maxim Biro
|
f03dc44e97
|
Fixed Windows build
|
2013-08-04 21:20:48 -04:00 |
|
irungentoo
|
f6207efef1
|
Merge pull request #326 from fhahn/private-functions-static2
Make private functions in core/ static
|
2013-08-04 15:22:01 -07:00 |
|
irungentoo
|
5074146ab4
|
Merge pull request #327 from stqism/master
Fixed 2 Null pointer derefrences in both nTox and toxic
|
2013-08-04 15:20:13 -07:00 |
|
Sean Qureshi
|
a8f752130b
|
Fixed 2 Null pointer derefrences in both nTox and toxic
|
2013-08-04 14:36:09 -07:00 |
|
charmlesscoin
|
1b6c16f7ff
|
Merge https://github.com/stqism/ProjectTox-Core
|
2013-08-04 17:35:56 -04:00 |
|
Florian Hahn
|
7567e0a1c4
|
Make private functions in core/DHT.c static
|
2013-08-04 23:05:43 +02:00 |
|
Florian Hahn
|
c387de52b2
|
Make private functions in core/LAN_discovery.c static
|
2013-08-04 23:05:35 +02:00 |
|
Florian Hahn
|
2a9fedc08f
|
Make private functions in core/Lossless_UDP.c static
|
2013-08-04 23:05:27 +02:00 |
|
Florian Hahn
|
8680cf76bf
|
Make private functions in core/net_crypto.c static
|
2013-08-04 23:05:20 +02:00 |
|
irungentoo
|
10024f5073
|
Merge pull request #325 from stqism/master
Fixed a calloc getting freed before being used
|
2013-08-04 13:25:57 -07:00 |
|
Sean Qureshi
|
0fad8e3638
|
Fixed a calloc getting freed before being used
|
2013-08-04 13:16:08 -07:00 |
|
irungentoo
|
b9f387b3b7
|
Merge pull request #311 from CharmlessCoin/nTox
nTox Cleaning
|
2013-08-04 08:27:15 -07:00 |
|
irungentoo
|
b4ae32c1c3
|
Merge pull request #313 from CharmlessCoin/bug_fixes
Removed memory leak, thanks to diath for spotting it.
|
2013-08-04 07:24:00 -07:00 |
|
irungentoo
|
b2622726b1
|
Merge pull request #319 from stqism/master
Manually merged #314 and #317, resolving errors if both merged
|
2013-08-04 07:18:20 -07:00 |
|
irungentoo
|
b0f3b27fc8
|
Merge pull request #321 from plutooo/master
toxic: Fixed doMessenger() interval.. Toxic is much faster and responsiv...
|
2013-08-04 07:15:49 -07:00 |
|
Tim Malte Gräfje
|
0259cb0194
|
added fix in nTox_win32.c
|
2013-08-04 13:01:20 +02:00 |
|
Sean Qureshi
|
b471236c50
|
Manally merged #314 and #317
|
2013-08-04 03:52:24 -07:00 |
|
plutooo
|
5300e98288
|
toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now.
|
2013-08-04 03:27:36 -07:00 |
|
Jfreegman
|
91d883c4a4
|
already a pull request with this addition
|
2013-08-04 05:32:53 -04:00 |
|
charmlesscoin
|
ae8367dc3e
|
whoops, returning a free'd variable is really not what I meant...
|
2013-08-04 05:09:12 -04:00 |
|
Jfreegman
|
7b380ed6d2
|
didn't mean to delete that
|
2013-08-04 05:00:16 -04:00 |
|
Jfreegman
|
b513c3d352
|
added command functionality to chat windows and a few minor improvements
|
2013-08-04 04:42:17 -04:00 |
|
charmlesscoin
|
0b6806d7f7
|
Removed memory leak, thanks to diath for spotting it.
|
2013-08-04 04:29:32 -04:00 |
|
Jfreegman
|
357c02ac22
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-08-04 02:40:57 -04:00 |
|
charmlesscoin
|
b36bca295c
|
fixed bug that would cause this to always exit
|
2013-08-03 21:59:17 -04:00 |
|
Tim Malte Gräfje
|
170af10204
|
Merge remote-tracking branch 'upstream/master'
|
2013-08-04 02:17:14 +02:00 |
|
Tim Malte Gräfje
|
5817c2c888
|
fix for #288
nTox will now display a message if you try to accept a not yet received
or already accepted friend request
|
2013-08-04 01:46:54 +02:00 |
|
irungentoo
|
6f0ae0dbb4
|
Merge pull request #308 from jaekwon/bleh
various fixes for first time user
|
2013-08-03 16:10:17 -07:00 |
|
charmlesscoin
|
175a434de3
|
removed some magic numbers from line_eval()
|
2013-08-03 18:06:28 -04:00 |
|
charmlesscoin
|
6222e32848
|
added some better error checking for print_nickname() anr print_statuschange()
|
2013-08-03 18:02:09 -04:00 |
|
charmlesscoin
|
43f6608530
|
cleaned up load_key() and added more error checking
|
2013-08-03 17:57:44 -04:00 |
|
irungentoo
|
68317c8d51
|
Merge pull request #307 from CharmlessCoin/toxic
fix for issue #306
|
2013-08-03 14:52:25 -07:00 |
|
Jae Kwon
|
158751cb2d
|
various fixes for first time user
* added linking to libsodium
* fixed links to docs to point to wiki
|
2013-08-03 14:46:52 -07:00 |
|
charmlesscoin
|
a65715e811
|
fix for issue #306
|
2013-08-03 17:29:18 -04:00 |
|