merger from branch luminous (~r11576)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11580 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-10-04 05:04:23 +00:00
commit 51bb8d1985
91 changed files with 1157 additions and 703 deletions

View file

@ -660,6 +660,7 @@
<!-- 에디터 활성화 -->
<script>//<![CDATA[
var editor_path = "{$editor_path}";
var auto_saved_msg = "{$lang->msg_auto_saved}";
var delete_dr_confirm_msg = "{$lang->edit->msg_dr_delete_confirm}";
var no_selected_object_msg = "{$lang->edit->msg_no_selected_object}";