Changeset 387467
- Timestamp:
- 05/21/2011 05:54:57 PM (15 years ago)
- File:
-
- 1 edited
-
wp-itheora/trunk/wp-itheora.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wp-itheora/trunk/wp-itheora.php
r387466 r387467 42 42 } 43 43 44 <<<<<<< HEAD45 44 function itheora_admin(){ 46 45 add_action('admin_menu', array(&$this, 'wp_itheora_menu')); … … 166 165 function wp_itheora_infopage() { 167 166 $this->wp_itheora_header(); 167 <<<<<<< HEAD 168 168 echo " 169 169 <div id=\"wp-itheora-info\"> … … 281 281 } 282 282 283 <<<<<<< HEAD 283 284 284 285 global $WPItheora;
Note: See TracChangeset
for help on using the changeset viewer.