Merge pull request #623 from Bahkuh/master

Minor corrections & additions
This commit is contained in:
irungentoo 2013-10-18 09:25:33 -07:00
commit 92f185c6b3
2 changed files with 8 additions and 1 deletions

7
.gitignore vendored
View File

@ -1,4 +1,11 @@
# OS files
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ethumbs.db
Thumbs.db
//nacl build
nacl/build/

View File

@ -266,7 +266,7 @@ int group_peername(Group_Chat *chat, int peernum, uint8_t *name)
return -1;
if (chat->group[peernum].nick_len == 0) {
memcpy(name, "NSA Agent", 10); /* Kindly remind the user that someone with no name might be a NSA agent.*/
memcpy(name, "NSA Agent", 10); /* Kindly remind the user that someone with no name might be an NSA agent.*/
return 10;
}