From a6117aa9b7f9161bbd9a7bebe2534f8261926f87 Mon Sep 17 00:00:00 2001 From: Leeo Date: Sat, 27 Aug 2022 11:23:40 +0900 Subject: [PATCH 01/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e114a7..ff3a7b2 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ 1. 화면 왼쪽 위에 Fork 버튼을 눌러 레포지토리를 포크 해주세요. 2. Code를 눌러서 git Clone을 해주세요. 혹은 GUI에서 git clone을 진행해주세요. 3. 각각의 챕터에 가서 다시 readme를 읽으면서 진행해주세요! +4. 레포지토리 마음에 드셨으면 Star를 눌러주세요! From fe929fba88d931e5a3e73fbe8fe3cc16a4dc742b Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 18:26:18 +0900 Subject: [PATCH 02/14] Docs : add email, git ID --- 3.commit/prfoile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 9522792..6f38432 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : -gitID : +email : shay0454@naver.com +gitID : shay0454 From eae105461271cdf3f933884bf5f3319730d255ee Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 18:40:26 +0900 Subject: [PATCH 03/14] =?UTF-8?q?Chore=20:=20=ED=80=98=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 조각 8개, 나뭇가지 4개 --- 4.branchANdMerge/Quests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index c44f904..f6cc681 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (8/50) +낡은 나뭇가지(4/40) From 100aa40a35fa1cb7aafffc6e21c4af40fb42a85e Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 18:42:29 +0900 Subject: [PATCH 04/14] =?UTF-8?q?Chore=20:=20=ED=80=98=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 조각 30개, 나뭇가지 4개 --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index f6cc681..eef50a0 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (8/50) +깨진 구슬조각 (30/50) 낡은 나뭇가지(4/40) From 12e971d36cf7b5716ebd97063b634d601a4bd6c0 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 18:43:40 +0900 Subject: [PATCH 05/14] =?UTF-8?q?Chore=20:=20=ED=80=98=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 조각 50개, 나뭇가지 4개 --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index eef50a0..ea3cc88 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (30/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(4/40) From 86aef3d05fc0936598b267581333c0943b2d8911 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 18:44:43 +0900 Subject: [PATCH 06/14] =?UTF-8?q?Chore=20:=20=ED=80=98=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 조각 8개, 나뭇가지 20개 --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index f6cc681..6ea5c89 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (8/50) -낡은 나뭇가지(4/40) +낡은 나뭇가지(20/40) From 04df328d4641a631e388bd5c6c5f0d86f3e34078 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 18:45:21 +0900 Subject: [PATCH 07/14] =?UTF-8?q?Chore=20:=20=ED=80=98=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 조각 8개, 나뭇가지 40개 --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index 6ea5c89..ac828c1 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (8/50) -낡은 나뭇가지(20/40) +낡은 나뭇가지(40/40) From eb8b500d62a461d097510e05a8c921eb30b67032 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 19:07:28 +0900 Subject: [PATCH 08/14] =?UTF-8?q?Chore=20:=20=EC=98=A4=ED=83=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 6.stash/hasTypo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/6.stash/hasTypo.txt b/6.stash/hasTypo.txt index a4b9065..9bfad50 100644 --- a/6.stash/hasTypo.txt +++ b/6.stash/hasTypo.txt @@ -1 +1 @@ -아버지 가방에 들어가신댜규요? +아버지가 방에 들어가신댜규요? From 8a1cada1d91b8773c64b0638fdf8e695cf5cc1e8 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 19:08:51 +0900 Subject: [PATCH 09/14] =?UTF-8?q?Chore=20:=20=EB=82=B4=EC=9A=A9=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 6.stash/todoList.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/6.stash/todoList.txt b/6.stash/todoList.txt index e69de29..316be99 100644 --- a/6.stash/todoList.txt +++ b/6.stash/todoList.txt @@ -0,0 +1 @@ +1. SDL 공부 \ No newline at end of file From 7ac548831e815a3f7eb02a8973f4aec5bdb4d6c1 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 23:30:45 +0900 Subject: [PATCH 10/14] =?UTF-8?q?Feature=20:=20=ED=8C=94=EB=A1=9C=EC=9A=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 페이스 북으로 팔로우 --- "7.cherryPick/\355\214\224\353\241\234\354\232\260" | 1 + 1 file changed, 1 insertion(+) diff --git "a/7.cherryPick/\355\214\224\353\241\234\354\232\260" "b/7.cherryPick/\355\214\224\353\241\234\354\232\260" index 2fa30c2..2d06a77 100644 --- "a/7.cherryPick/\355\214\224\353\241\234\354\232\260" +++ "b/7.cherryPick/\355\214\224\353\241\234\354\232\260" @@ -1 +1,2 @@ 기능 +페이스북 팔로우 기능 \ No newline at end of file From e722403610b24dd2cc68987762fdf31edf3286dd Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 23:19:50 +0900 Subject: [PATCH 11/14] =?UTF-8?q?feature=20:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 페이스 북으로 로그인 --- "7.cherryPick/\353\241\234\352\267\270\354\235\270" | 1 + 1 file changed, 1 insertion(+) diff --git "a/7.cherryPick/\353\241\234\352\267\270\354\235\270" "b/7.cherryPick/\353\241\234\352\267\270\354\235\270" index 2fa30c2..ab04349 100644 --- "a/7.cherryPick/\353\241\234\352\267\270\354\235\270" +++ "b/7.cherryPick/\353\241\234\352\267\270\354\235\270" @@ -1 +1,2 @@ 기능 +1. 페이스북으로 로그인 \ No newline at end of file From 82bf881a2765023803ab1bfcb1917dcdc4660743 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 23:53:42 +0900 Subject: [PATCH 12/14] =?UTF-8?q?Chore=20:=20=EC=9A=94=EB=A6=AC=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EB=94=94=EC=89=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 9.rebase/food | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/food b/9.rebase/food index bb5e882..f634ff0 100644 --- a/9.rebase/food +++ b/9.rebase/food @@ -1,3 +1,3 @@ -1. mainDish (0/1) +1. mainDish (1/1) 2. pasta (0/2) 3. drink (0/4) From e2f2d4c89651afe1bd50a7ca1f5f4489e01de865 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Wed, 10 Dec 2025 23:53:59 +0900 Subject: [PATCH 13/14] =?UTF-8?q?Chore=20:=20=EC=9A=94=EB=A6=AC=20?= =?UTF-8?q?=EB=81=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 9.rebase/food | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/9.rebase/food b/9.rebase/food index f634ff0..c29ef48 100644 --- a/9.rebase/food +++ b/9.rebase/food @@ -1,3 +1,3 @@ 1. mainDish (1/1) -2. pasta (0/2) -3. drink (0/4) +2. pasta (2/2) +3. drink (4/4) From 71d17498b3dd06dc17593d21f01058bb77278404 Mon Sep 17 00:00:00 2001 From: shay0454 Date: Thu, 11 Dec 2025 00:42:19 +0900 Subject: [PATCH 14/14] =?UTF-8?q?Docs=20:=20=ED=9B=84=EA=B8=B0=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 11. firstPR/guestBook | 1 + 1 file changed, 1 insertion(+) diff --git a/11. firstPR/guestBook b/11. firstPR/guestBook index 5f07315..06e5733 100644 --- a/11. firstPR/guestBook +++ b/11. firstPR/guestBook @@ -1,2 +1,3 @@ |닉네임|gitID|후기| |------|------|------| +|shay0454|shay0454|git에 대해 기본적인 것을 알게 되었습니다.| \ No newline at end of file