Commit Graph

467 Commits

Author SHA1 Message Date
irungentoo
31d9af8e76 Merge pull request #205 from mhinz/fix-indent
Fix space/tab indentation
2013-07-31 04:33:51 -07:00
irungentoo
335fe2b860 Merge pull request #206 from pflo/master
Added the short documentations
2013-07-31 04:33:27 -07:00
Marco Hinz
439de6fa3a Fix space/tab indentation 2013-07-31 10:36:02 +02:00
pflo
c4a5dabe05 Create start_guide.md
Written by charmlesscoin.
2013-07-31 15:28:36 +07:00
pflo
11d4f18abd Create start_guide.de.md
Translated the original small documentation to german.
2013-07-31 15:27:19 +07:00
irungentoo
52a77cc997 Merge pull request #187 from Teknocrat/master
libconfig dependency
2013-07-30 17:47:12 -07:00
teknocrat
b1ec17a357 Merge branch 'patch-1' of https://github.com/Teknocrat/ProjectTox-Core into patch-1 2013-07-30 19:29:33 -05:00
Teknocrat
7803acc375 Create FindLibConfig.cmake
Warning, this is a google snippet, but works fine, shouldn't be an issue
2013-07-30 19:12:29 -05:00
Teknocrat
4faa145789 Update CMakeLists.txt
This thing requires libconfig but doesn't test for it...
2013-07-30 19:09:36 -05:00
irungentoo
1b4eea2186 Small fixes. 2013-07-30 19:38:05 -04:00
irungentoo
f6d508735a Merge branch 'patch-3' of https://github.com/Astonex/ProjectTox-Core into Astonex-patch-3 2013-07-30 19:28:36 -04:00
irungentoo
f25bfb9341 Merge pull request #183 from Proplex/master
Update readme with tutorial videos
2013-07-30 16:14:38 -07:00
Astonex
cd0518a45c Update Messenger.c
Offer more meaningful returns so appropriate actions can be taken by the GUI.
2013-07-31 00:13:31 +01:00
NemDiggers
69980e3c0c Remind users that directory isn't actually legit 2013-07-30 19:09:29 -04:00
NemDiggers
d169e68450 break line 2013-07-30 19:03:39 -04:00
NemDiggers
0e091f7c58 Add tutorial videos to readme
I promise they're legit<3
2013-07-30 19:03:04 -04:00
irungentoo
d97db7fcb8 Merge pull request #179 from theshadowfog/patch-5
Update nTox.c
2013-07-30 15:29:52 -07:00
irungentoo
bdefabe3f2 Merge pull request #182 from RichiH/patch-1
README.md: s/Freenode/freenode/
2013-07-30 15:29:29 -07:00
Richard Hartmann
2696134363 README.md: s/Freenode/freenode/ 2013-07-31 00:25:00 +02:00
irungentoo
5298e800e9 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-07-30 18:01:30 -04:00
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
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