diff --git a/.gitignore b/.gitignore index ca766c016..4bc4f406c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ +<<<<<<< HEAD dbconfig.php log .htaccess data +======= +/.htaccess +data/ +>>>>>>> g5 test config.php sirgle @@ -11,8 +16,16 @@ skin/latest/basic2 rankiss* thumb.lib.php test.php +<<<<<<< HEAD g4s_tree +======= +>>>>>>> g5 itzimara* nemoluv* cheditor* *.key +<<<<<<< HEAD +g5_tree +======= +*.sh +>>>>>>> g5 diff --git a/LICENSE.txt b/LICENSE.txt index 9aba762af..e337cb205 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ 소프트웨어 제품은 저작권법 및 국제저작권 협약을 비롯하여, 기타 지적재산권법 및 협약의 보호를 받습니다. -프로그램 명칭 : 그누보드4S (GNUBoard 4 Second Edition) +프로그램 명칭 : 그누보드5 ( GNU Board 5 ) 저작자 : (주)에스아이알소프트 http://sir.co.kr diff --git a/README.md b/README.md deleted file mode 100644 index b12d99bd8..000000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -g4s -=== - -gnuboard 4 standard \ No newline at end of file diff --git a/_head.php b/_head.php index d67f96ad2..79e267fb7 100644 --- a/_head.php +++ b/_head.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/_tail.php b/_tail.php index 89b2c1c70..ae47c3b51 100644 --- a/_tail.php +++ b/_tail.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/adm/_common.php b/adm/_common.php index 10d75360f..cd443b18e 100644 --- a/adm/_common.php +++ b/adm/_common.php @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/adm/admin.head.php b/adm/admin.head.php index 7a6ca1b98..b1c3b5f91 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit; $begin_time = get_microtime(); -include_once(G4_PATH.'/head.sub.php'); +include_once(G5_PATH.'/head.sub.php'); function print_menu1($key, $no) { @@ -16,7 +16,7 @@ function print_menu1($key, $no) function print_menu2($key, $no) { - global $menu, $auth_menu, $is_admin, $auth, $g4; + global $menu, $auth_menu, $is_admin, $auth, $g5; $str .= "