irungentoo
|
c58ffba4f0
|
Merge branch 'master' into nurupo-master
Conflicts:
.travis.yml
|
2013-07-30 18:00:59 -04:00 |
|
Maxim Biro
|
010adbe0ac
|
Modified Travis to build libconfig from sources
|
2013-07-30 17:58:38 -04:00 |
|
Greg
|
20e4cd0a17
|
Update nTox.c
Edited help message.
|
2013-07-30 17:51:16 -04:00 |
|
irungentoo
|
f1486e5092
|
Merge pull request #178 from theshadowfog/patch-3
Update nTox.c
|
2013-07-30 14:43:42 -07:00 |
|
Greg
|
3edb2f1f12
|
Update nTox.c
Gives the user his ID.
|
2013-07-30 17:36:25 -04:00 |
|
irungentoo
|
ee1a0f5acc
|
Merge pull request #174 from Shivamshaz/patch-1
Update .gitignore
|
2013-07-30 13:22:18 -07:00 |
|
irungentoo
|
358da6da2c
|
Merge pull request #175 from plutooo/master
Fixed a bunch of bugs in TOXIC, added friendlist and more.
|
2013-07-30 12:52:49 -07:00 |
|
plutooo
|
026790e181
|
Fixed a bunch of bugs in TOXIC, added friendlist and more.
|
2013-07-30 12:47:40 -07:00 |
|
plutooo
|
c51e5c358a
|
Merge pull request #1 from irungentoo/master
pull latest
|
2013-07-30 12:45:28 -07:00 |
|
irungentoo
|
cc5e67c550
|
Merge pull request #172 from rylai-/master
travis: use apt-get -y option instead of GNU yes
|
2013-07-30 12:21:56 -07:00 |
|
Rylai
|
579fa95df4
|
travis: use -q instead of -qq to prevent travis from sometimes timing out on long apt-get updates
|
2013-07-30 15:17:18 -04:00 |
|
Rylai
|
fd13ae24c4
|
travis: use apt-get -y option instead of GNU yes
The Advanced Packaging Tool has an option to automatically assume Yes to all queries. We don't
need to use GNU yes for this.
|
2013-07-30 15:17:18 -04:00 |
|
Shivam Bansal
|
0fd49915f4
|
Update .gitignore
|
2013-07-30 12:02:16 -07:00 |
|
irungentoo
|
bd695135dc
|
Fixed segfault.
|
2013-07-30 14:43:32 -04:00 |
|
Dmitry Marakasov
|
5ac7f3d990
|
Fix "comparison is always true due to limited range of data type" warning
|
2013-07-30 22:41:09 +04:00 |
|
Dmitry Marakasov
|
6d0abb4132
|
Add missing newlines at EOF in sources
(missing newlines break build due to -Werror)
|
2013-07-30 22:39:04 +04:00 |
|
irungentoo
|
77fa38f597
|
Clarification.
|
2013-07-30 14:32:18 -04:00 |
|
irungentoo
|
87388b302e
|
Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core into blackwolf12333-master
Also fixed his pull request.
|
2013-07-30 14:30:33 -04:00 |
|
irungentoo
|
2d31136994
|
Merge pull request #168 from nurupo/master
Added a note about libconfig
|
2013-07-30 10:51:09 -07:00 |
|
Maxim Biro
|
60250546ca
|
Added a note about libconfig
|
2013-07-30 13:27:32 -04:00 |
|
irungentoo
|
b94d9d6765
|
Merge branch 'patch-1' of https://github.com/dypa/ProjectTox-Core into dypa-patch-1
Conflicts:
INSTALL.md
|
2013-07-30 12:29:52 -04:00 |
|
irungentoo
|
066c5e4780
|
Merge pull request #166 from theshadowfog/patch-2
Update nTox.c
|
2013-07-30 09:27:10 -07:00 |
|
irungentoo
|
e5db760f7c
|
Merge pull request #165 from nurupo/master
Fixed cmake
|
2013-07-30 09:26:48 -07:00 |
|
Maxim Biro
|
184eaacd2a
|
Fixed cmake
|
2013-07-30 12:08:48 -04:00 |
|
Greg
|
915ffaa888
|
Update nTox.c
Added help command to nTox.c
|
2013-07-30 11:58:51 -04:00 |
|
Peter Maatman
|
dc57b779d2
|
added utility function format_message
|
2013-07-30 17:43:17 +02:00 |
|
Peter Maatman
|
2c756f1c53
|
changing testing clients to reflect changes made in core/Messenger.h
|
2013-07-30 17:10:20 +02:00 |
|
Peter Maatman
|
12b19f6910
|
renamed getname to getfriendname and added a getname function to get the name of our client
|
2013-07-30 17:09:09 +02:00 |
|
irungentoo
|
c10d2317ca
|
Merge pull request #161 from theshadowfog/patch-1
Update INSTALL.md
|
2013-07-30 08:08:28 -07:00 |
|
Greg
|
d1a26f720f
|
Update INSTALL.md
|
2013-07-30 11:04:59 -04:00 |
|
dypa
|
1ae27fb227
|
replace make install to checkinstall for linux installation
|
2013-07-30 06:40:16 -07:00 |
|
irungentoo
|
3f85bdca15
|
Fixed warning.
|
2013-07-30 08:48:36 -04:00 |
|
irungentoo
|
dbdeb670e4
|
Typo in readme fixed.
|
2013-07-30 08:43:44 -04:00 |
|
irungentoo
|
5a6645709b
|
Fixed build.
|
2013-07-30 07:38:47 -04:00 |
|
irungentoo
|
b1726f55ed
|
Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master
Conflicts:
testing/CMakeLists.txt
|
2013-07-30 07:31:51 -04:00 |
|
irungentoo
|
e9dd83b543
|
Merge pull request #146 from boredomist/patch-1
Replace magic value "7" with string "echo"
|
2013-07-30 04:26:31 -07:00 |
|
irungentoo
|
0c251d4b1d
|
Merge pull request #154 from xistance21/master
Add invalid command
|
2013-07-30 04:23:11 -07:00 |
|
irungentoo
|
374a4e32cb
|
Merge pull request #155 from Astonex/master
Updating nTox_win32 and adding Messenger.c method
|
2013-07-30 04:22:39 -07:00 |
|
irungentoo
|
2491b2b429
|
Merge pull request #152 from rlewon/messenger_friend_list_ntox
New friend list function for nTox client.
|
2013-07-30 04:20:47 -07:00 |
|
irungentoo
|
15c0b144ca
|
Merge pull request #150 from Astonex/patch-2
Update INSTALL.md
|
2013-07-30 04:19:30 -07:00 |
|
Emir Unluturk
|
1c345e7f6b
|
Add invalid command
|
2013-07-30 12:31:02 +03:00 |
|
Astonex
|
6ea5420a07
|
Implemented m_delfriend()
|
2013-07-30 09:56:39 +01:00 |
|
Astonex
|
d5e5412cb3
|
Slight aesthetic change
|
2013-07-30 09:23:15 +01:00 |
|
Astonex
|
e920be4c01
|
Fixed the friends listing
|
2013-07-30 09:21:22 +01:00 |
|
Astonex
|
84a0871cf6
|
Fixed bugs, added friend listing (slightly buggy), and changed the general aesthetics
|
2013-07-30 08:52:18 +01:00 |
|
Ryan Lewon
|
20aad9c73b
|
Removed unneeded include.
Fixed formatting and cleaned up output.
|
2013-07-30 07:26:58 +00:00 |
|
Ryan Lewon
|
09a71f37ec
|
New friend list function for nTox client.
|
2013-07-30 07:19:54 +00:00 |
|
Astonex
|
3b52624f58
|
Update INSTALL.md
Changing the libsodium link from a list of its release archives to the windows specific one - it is windows specific install instructions after all.
|
2013-07-30 04:41:09 +01:00 |
|
Erik Price
|
de7ebc55b1
|
Replace magic value "7" with string "echo"
|
2013-07-29 21:32:27 -04:00 |
|
Maxim Biro
|
261f365e55
|
Fixed function signature
|
2013-07-29 20:47:12 -04:00 |
|