Commit Graph

5338 Commits

Author SHA1 Message Date
irungentoo
55a2e59a64 Fixed build. 2013-07-31 08:35:06 -04:00
irungentoo
f2f266e9a7 Merge branch 'master' of https://github.com/xzfc/ProjectTox-Core into xzfc-master
Conflicts:
	CMakeLists.txt
2013-07-31 07:56:10 -04:00
irungentoo
7252456c87 Merge pull request #171 from AMDmi3/freebsd-fixes
FreeBSD fixes
2013-07-31 04:46:12 -07:00
irungentoo
d28726cacb Merge pull request #189 from CharmlessCoin/master
Added a list of user commands under docs/, and a "start-up" guide.
2013-07-31 04:43:55 -07:00
irungentoo
943694a746 Merge pull request #190 from pyrobisqit/patch-1
Update readme.md
2013-07-31 04:43:12 -07:00
irungentoo
f2d310b91a Merge pull request #191 from theshadowfog/patch-6
Update nTox.c
2013-07-31 04:42:48 -07:00
irungentoo
0c27406389 Merge pull request #193 from Astonex/master
Fixed cpu usage
2013-07-31 04:42:08 -07:00
irungentoo
b4eb49eae2 Merge pull request #200 from jquadrin/master
stat file before attempting to open
2013-07-31 04:37:08 -07:00
irungentoo
b2dbefb4c9 Merge pull request #201 from blast-hardcheese/master
Adding homebrew commands to INSTALL
2013-07-31 04:34:45 -07:00
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
Jfreegman
17e64b3ee5 initialize num_requests 2013-07-31 05:52:08 -04:00
charmlesscoin
e52db5b8b7 Wrote the commands down and a 'start up' guide. 2013-07-31 05:00:40 -04:00
xzfcpw
f77fe65d54 NaCl compiling option 2013-07-31 15:42:05 +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
Joseph Quadrino
9f6be0ce4b stat file before attempting to open 2013-07-31 03:07:51 -04:00
Devon Stewart
fedb82e9d6 Adding homebrew commands to INSTALL 2013-07-31 16:05:29 +09:00
Stuart Banks
207c067cf2 Clean up/format code 2013-07-31 02:15:01 -04:00
Astonex
d848c15912 Fixed cpu usage 2013-07-31 04:32:18 +01:00
Dmitry Marakasov
89dd7ed011 Add detection of required libraries 2013-07-31 06:15:26 +04:00
Greg
2d7143e850 Update nTox.c
Made the help message a string type.
2013-07-30 21:36:22 -04:00
pyrobisqit
bd8ba0bd6e Update readme.md
Basically, a few words tweaked here and there, to make the file more gramatically correct.
2013-07-31 03:17:40 +02: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