Changeset 6343 for branches/2.1/plugins/LocalFilesEditor
- Timestamp:
- May 24, 2010, 10:51:03 PM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 19 edited
-
branches/2.1
- 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
Note: See TracChangeset
for help on using the changeset viewer.