From ff11e7398bd27e2fa4ab63469bd07c02b1d3e581 Mon Sep 17 00:00:00 2001 From: Bahkuh Date: Thu, 17 Oct 2013 14:25:44 +0200 Subject: [PATCH 1/2] Fixed minor typo. --- toxcore/group_chats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toxcore/group_chats.c b/toxcore/group_chats.c index c32b26ba..0d6d6972 100644 --- a/toxcore/group_chats.c +++ b/toxcore/group_chats.c @@ -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; } From 8352c7b72161e335958df358d0d659fd1f4ac04e Mon Sep 17 00:00:00 2001 From: Bahkuh Date: Fri, 18 Oct 2013 10:47:02 +0200 Subject: [PATCH 2/2] Added more OS generated files to .gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 059987b5..aa7d8f50 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,11 @@ +# OS files .DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ethumbs.db +Thumbs.db //nacl build nacl/build/