irungentoo
|
50a617a579
|
Merge pull request #231 from KenanY/gitignore-sodium
Add sodium/ to .gitignore
|
2013-08-01 04:21:44 -07:00 |
|
irungentoo
|
2916b6e88b
|
Merge pull request #235 from bigfack/master
Update start_guide.md
|
2013-08-01 04:20:35 -07:00 |
|
irungentoo
|
e42deccc0e
|
Merge pull request #237 from chovy/master
Add Mac OSX instructions
|
2013-08-01 04:20:13 -07:00 |
|
irungentoo
|
b553043b17
|
Merge pull request #236 from CharmlessCoin/network
Add get_broadcast()
|
2013-08-01 04:19:17 -07:00 |
|
Anthony Ettinger
|
dba9f18213
|
add cmake to brew packages
|
2013-08-01 03:25:40 -07:00 |
|
Anthony Ettinger
|
93aad4428b
|
mac on homepage
|
2013-08-01 03:18:36 -07:00 |
|
Anthony Ettinger
|
efe63ef1b3
|
mac on homepage
|
2013-08-01 03:17:21 -07:00 |
|
charmlesscoin
|
5ceb601fcd
|
restored this branch to be on par with upstream
|
2013-08-01 03:42:33 -04:00 |
|
bigfack
|
d40ec2c9aa
|
Update start_guide.md
More edits.
|
2013-08-01 01:58:44 -05:00 |
|
bigfack
|
1f0329582c
|
Update start_guide.md
Fixed a spelling mistake.
|
2013-08-01 01:42:16 -05:00 |
|
Kenan Yildirim
|
026b715dcd
|
Add sodium/ to .gitignore
Because Windows devs.
|
2013-07-31 23:31:06 -04:00 |
|
irungentoo
|
c3b5fe3fa1
|
Merge pull request #227 from Proplex/master
Add help command to Toxic
|
2013-07-31 17:29:35 -07:00 |
|
irungentoo
|
b5b28e43f8
|
Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master
Conflicts:
testing/nTox_win32.c
|
2013-07-31 20:27:13 -04:00 |
|
NemDiggers
|
1e1c731470
|
Add help command to Toxic
|
2013-07-31 20:23:15 -04:00 |
|
Astonex
|
7417dfe216
|
Fixed friends list and deleting friends. Automatically loads name/status from last time.
|
2013-08-01 01:14:02 +01:00 |
|
irungentoo
|
bf17d6eb2e
|
Merge pull request #224 from cedeon/master
added required linker flag to 'compile with' remark
|
2013-07-31 16:44:18 -07:00 |
|
irungentoo
|
1ff5d67ef9
|
Merge pull request #223 from Proplex/master
Remove period from status set
|
2013-07-31 16:41:12 -07:00 |
|
NemDiggers
|
d7dcb6f095
|
Remove period from status set
It can make for awkward displays if you put a period in your status.
|
2013-07-31 19:02:06 -04:00 |
|
William Culver
|
5d8a1c60e8
|
added required linker flag to 'compile with' remark
|
2013-08-01 00:01:35 +01:00 |
|
irungentoo
|
1a8017d4d4
|
Merge pull request #218 from bahamas10/dave-touchup-docs
touch up docs to link to eachother
|
2013-07-31 15:07:26 -07:00 |
|
irungentoo
|
b81dc5508c
|
Merge pull request #219 from JFreegman/master
Partially fixed friend add bug
|
2013-07-31 15:06:40 -07:00 |
|
Astonex
|
f05aa30870
|
Merge remote-tracking branch 'ProjectTox/master'
|
2013-07-31 23:02:09 +01:00 |
|
Astonex
|
8dfba27242
|
Slight changes
|
2013-07-31 23:01:59 +01:00 |
|
Jfreegman
|
52ddf5ec43
|
forgot to print messages
|
2013-07-31 17:45:45 -04:00 |
|
Jfreegman
|
00e2cf8a41
|
formatting
|
2013-07-31 17:40:19 -04:00 |
|
Jfreegman
|
44d9e24855
|
small fix
|
2013-07-31 17:38:39 -04:00 |
|
Jfreegman
|
0ae9ec1815
|
partially fixed friend add bug (key length test still broken)
|
2013-07-31 17:36:04 -04:00 |
|
Jfreegman
|
a448d39fd7
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-07-31 17:30:51 -04:00 |
|
Jfreegman
|
8f6e1d8fbf
|
partially fixed friend add bug (key length test still broken)
|
2013-07-31 17:30:16 -04:00 |
|
Dave Eddy
|
a784c852f4
|
touch up docs to link to eachother
|
2013-07-31 17:15:32 -04:00 |
|
irungentoo
|
c558cb63f6
|
Merge pull request #216 from JFreegman/master
remove debugging printf statement
|
2013-07-31 13:00:08 -07:00 |
|
Jfreegman
|
3eafbc900e
|
remove debugging printf statement
|
2013-07-31 15:34:34 -04:00 |
|
irungentoo
|
0d5eef4b43
|
Backspace key should now work on more terminals in toxic.
|
2013-07-31 15:22:43 -04:00 |
|
irungentoo
|
639d1faa5d
|
Merge pull request #215 from plutooo/master
toxic: Made everything 1000x more userfriendly.
|
2013-07-31 11:23:13 -07:00 |
|
plutooo
|
0815d1110d
|
toxic: Made everything 1000x more userfriendly.
|
2013-07-31 11:20:16 -07:00 |
|
irungentoo
|
3c177d6a83
|
Merge pull request #213 from plutooo/master
Added chat windows, and some clean up.
|
2013-07-31 10:31:21 -07:00 |
|
plutooo
|
2247b7fad5
|
Added chat windows, and some clean up.
|
2013-07-31 10:20:03 -07:00 |
|
irungentoo
|
14bf0699e7
|
Merge pull request #210 from nickodell/master
Show error message instead of "added friendnumber -1"
|
2013-07-31 09:50:50 -07:00 |
|
irungentoo
|
d0888f750c
|
Fixed something in readme.
|
2013-07-31 12:44:03 -04:00 |
|
irungentoo
|
5438da42c0
|
Merge pull request #209 from pyrobisqit/patch-1
more tweaks to README.md
|
2013-07-31 09:43:16 -07:00 |
|
Nick ODell
|
ccbe4c6799
|
Show error message instead of "added friendnumber -1"
|
2013-07-31 10:38:13 -06:00 |
|
pyrobisqit
|
d9f88fd89e
|
more tweaks to README.md
Simplified a few blocks and made it easier to read, corrected punctuation and bits here and there.
|
2013-07-31 16:46:49 +02:00 |
|
irungentoo
|
bdd13d1954
|
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts:
testing/nTox.c
|
2013-07-31 10:25:29 -04:00 |
|
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 |
|