merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
2026-01-23 13:19:56 +09:00 · 2012-07-27 02:47:10 +00:00 · 2012-07-27 02:47:10 +00:00 · 54e3a72065
commit 54e3a72065
parent 7aa4798373
334 changed files with 13011 additions and 5561 deletions
--- a/modules/trash/trash.view.php
+++ b/modules/trash/trash.view.php
@ -1,15 +1,17 @@
 <?php
 /**
- * @class  trashView
+ * trashView class
+ * View class of the module trash
+ *
 * @author NHN (developers@xpressengine.com)
- * @brief View class of the module trash
- **/
-
+ * @package /modules/trash
+ * @version 0.1
+ */
 class trashView extends trash {
-
 	/**
-	 * @brief Initialization
-	 **/
+	 * Initialization
+	 * @return void
+	 */
 	function init() {
 	}
 }