From 949f1215b608ecce9981c08d3cba1cab5bdb0931 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 13 Sep 2013 13:27:27 +0900
Subject: [PATCH 1/5] =?UTF-8?q?extend=20=ED=8F=B4=EB=8D=94=20=ED=8F=AC?=
 =?UTF-8?q?=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore       | 4 ++--
 extend/.htaccess | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 extend/.htaccess

diff --git a/.gitignore b/.gitignore
index 2387917b8..d93d16055 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.htaccess
+/.htaccess
 data
 test
 config.php
@@ -13,4 +13,4 @@ itzimara*
 nemoluv*
 cheditor*
 *.key
-*.sh
\ No newline at end of file
+*.sh
diff --git a/extend/.htaccess b/extend/.htaccess
new file mode 100644
index 000000000..05196c0b3
--- /dev/null
+++ b/extend/.htaccess
@@ -0,0 +1 @@
+# .htaccess

From eaf88fb55a02ccd88a3f5d061c09e298e0e5643b Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 13 Sep 2013 13:28:20 +0900
Subject: [PATCH 2/5] =?UTF-8?q?data=20=ED=8F=B4=EB=8D=94=EB=A5=BC=20?=
 =?UTF-8?q?=EB=AC=B4=EC=8B=9C=ED=95=98=EB=8F=84=EB=A1=9D=20data/=20?=
 =?UTF-8?q?=EC=99=80=20=EA=B0=99=EC=9D=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d93d16055..3e26fb122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /.htaccess
-data
+data/
 test
 config.php
 sirgle

From 0b2e174e9710ac555b38ecf13d77451f7b037bb9 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 13 Sep 2013 13:37:43 +0900
Subject: [PATCH 3/5] =?UTF-8?q?README.md=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index af43bad40..000000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-g5
-==
-
-그누보드5 개발자 버전

From 720b70acba5337937acb71017883b35433f40530 Mon Sep 17 00:00:00 2001
From: nemoluv <nemoluv@sir.co.kr>
Date: Fri, 13 Sep 2013 14:27:07 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=EB=95=8C=20colspan=20=EC=88=98=EC=A0=95=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_list.php      | 2 +-
 adm/boardgroup_list.php | 2 +-
 adm/poll_list.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/adm/board_list.php b/adm/board_list.php
index 109e0702d..6c367dab3 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -53,7 +53,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
 $g5['title'] = '게시판관리';
 include_once('./admin.head.php');
 
-$colspan = 15;
+$colspan = 16;
 ?>
 
 <form name="fsearch" id="fsearch" method="get">
diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php
index bee1433e6..a63af02c6 100644
--- a/adm/boardgroup_list.php
+++ b/adm/boardgroup_list.php
@@ -57,7 +57,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
 $g5['title'] = '게시판그룹설정';
 include_once('./admin.head.php');
 
-$colspan = 8;
+$colspan = 11;
 ?>
 
 <form id="fsearch" name="fsearch" method="get">
diff --git a/adm/poll_list.php b/adm/poll_list.php
index 9555f531e..b1a65b8e8 100644
--- a/adm/poll_list.php
+++ b/adm/poll_list.php
@@ -51,7 +51,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
 $g5['title'] = '투표관리';
 include_once('./admin.head.php');
 
-$colspan = 6;
+$colspan = 7;
 ?>
 
 <form id="fsearch" name="fsearch" method="get">

From 5d332663d690c4283a4fa5a0d18addab222bfabe Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Fri, 13 Sep 2013 14:30:09 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=EC=83=81=EC=88=98=20=EB=AF=B8=EC=84=A0?=
 =?UTF-8?q?=EC=96=B8=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20notice=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/install_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install/install_config.php b/install/install_config.php
index df45a2dd5..e19a24068 100644
--- a/install/install_config.php
+++ b/install/install_config.php
@@ -6,8 +6,8 @@ header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
 header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
 header('Pragma: no-cache'); // HTTP/1.0
 
-$title = G5_VERSION." 설치 3단계 중 2단계 설정";
 include_once ('../config.php');
+$title = G5_VERSION." 설치 3단계 중 2단계 설정";
 include_once ('./install.inc.php');
 
 if (isset($_POST['agree']) && $_POST['agree'] != '동의함') {