Changeset 6343
- Timestamp:
- May 24, 2010, 10:51:03 PM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 68 edited
-
branches/2.1
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/about.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/action.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/category.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/comments.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/feed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/identification.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/install.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/nbm.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/notification.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/password.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/picture.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/plugins
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/plugins/LocalFilesEditor
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor merged eligible /trunk/plugins/LocalFilesEditor merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/admin.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/admin.php merged eligible /trunk/plugins/LocalFilesEditor/admin.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/admin.tpl
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/admin.tpl merged eligible /trunk/plugins/LocalFilesEditor/admin.tpl merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/functions.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/functions.inc.php merged eligible /trunk/plugins/LocalFilesEditor/functions.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/index.php merged eligible /trunk/plugins/LocalFilesEditor/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/language
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/language merged eligible /trunk/plugins/LocalFilesEditor/language merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/language/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/language/index.php merged eligible /trunk/plugins/LocalFilesEditor/language/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/language/ja_JP
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/language/ja_JP merged eligible /trunk/plugins/LocalFilesEditor/language/ja_JP merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/language/ja_JP/description.txt
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/language/ja_JP/description.txt merged eligible /trunk/plugins/LocalFilesEditor/language/ja_JP/description.txt merged eligible
-
branches/2.1/plugins/LocalFilesEditor/language/ja_JP/index.php
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/language/ja_JP/index.php merged eligible /trunk/plugins/LocalFilesEditor/language/ja_JP/index.php merged eligible
-
branches/2.1/plugins/LocalFilesEditor/language/ja_JP/plugin.lang.php
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/language/ja_JP/plugin.lang.php merged eligible /trunk/plugins/LocalFilesEditor/language/ja_JP/plugin.lang.php merged eligible
-
branches/2.1/plugins/LocalFilesEditor/locfiledit.css
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/locfiledit.css merged eligible /trunk/plugins/LocalFilesEditor/locfiledit.css merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/main.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/main.inc.php merged eligible /trunk/plugins/LocalFilesEditor/main.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/maintain.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/maintain.inc.php merged eligible /trunk/plugins/LocalFilesEditor/maintain.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/show_default.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/show_default.php merged eligible /trunk/plugins/LocalFilesEditor/show_default.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/show_default.tpl
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/show_default.tpl merged eligible /trunk/plugins/LocalFilesEditor/show_default.tpl merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/LocalFilesEditor/update_config.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/LocalFilesEditor/update_config.php merged eligible /trunk/plugins/LocalFilesEditor/update_config.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/admin_multi_view
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/admin_multi_view merged eligible /trunk/plugins/admin_multi_view merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/admin_multi_view/controller.php
-
branches/2.1/plugins/admin_multi_view/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/admin_multi_view/index.php merged eligible /trunk/plugins/admin_multi_view/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/admin_multi_view/is_admin.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/admin_multi_view/is_admin.inc.php merged eligible /trunk/plugins/admin_multi_view/is_admin.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/admin_multi_view/language
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/admin_multi_view/language merged eligible /trunk/plugins/admin_multi_view/language merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/admin_multi_view/language/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/admin_multi_view/language/index.php merged eligible /trunk/plugins/admin_multi_view/language/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/admin_multi_view/language/ja_JP
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/plugins/admin_multi_view/language/ja_JP merged non-inheritable eligible /branches/2.0/plugins/admin_multi_view/language/ja_JP 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/plugins/admin_multi_view/language/ja_JP/description.txt
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/plugins/admin_multi_view/language/ja_JP/description.txt merged eligible /branches/2.0/plugins/admin_multi_view/language/ja_JP/description.txt 4963
-
branches/2.1/plugins/admin_multi_view/language/ja_JP/index.php
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/plugins/admin_multi_view/language/ja_JP/index.php merged eligible /branches/2.0/plugins/admin_multi_view/language/ja_JP/index.php 4963
-
branches/2.1/plugins/admin_multi_view/main.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/admin_multi_view/main.inc.php merged eligible /trunk/plugins/admin_multi_view/main.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/plugins/language_switch
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch merged eligible /trunk/plugins/language_switch merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/flags.tpl
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/flags.tpl merged eligible /trunk/plugins/language_switch/flags.tpl merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/index.php merged eligible /trunk/plugins/language_switch/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/language
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/language merged eligible /trunk/plugins/language_switch/language merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/language/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/language/index.php merged eligible /trunk/plugins/language_switch/language/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/language/ja_JP
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/plugins/language_switch/language/ja_JP merged non-inheritable eligible /branches/2.0/plugins/language_switch/language/ja_JP 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/plugins/language_switch/language/ja_JP/description.txt
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/plugins/language_switch/language/ja_JP/description.txt merged eligible /branches/2.0/plugins/language_switch/language/ja_JP/description.txt 4963
-
branches/2.1/plugins/language_switch/language/ja_JP/index.php
- Property svn:executable deleted
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/plugins/language_switch/language/ja_JP/index.php merged eligible /branches/2.0/plugins/language_switch/language/ja_JP/index.php 4963
-
branches/2.1/plugins/language_switch/language_switch-default.css
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/language_switch-default.css merged eligible /trunk/plugins/language_switch/language_switch-default.css merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/language_switch-ie6.css
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/language_switch-ie6.css merged eligible /trunk/plugins/language_switch/language_switch-ie6.css merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/language_switch.css
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/language_switch.css merged eligible /trunk/plugins/language_switch/language_switch.css merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/language_switch.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/language_switch.inc.php merged eligible /trunk/plugins/language_switch/language_switch.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/language_switch/main.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/language_switch/main.inc.php merged eligible /trunk/plugins/language_switch/main.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/popuphelp.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/profile.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/qsearch.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/random.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/register.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/search.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/search_rules.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/tags.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/upgrade.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/upgrade_feed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/upload.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/ws.php
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.