Changeset 6333
- Timestamp:
- May 24, 2010, 5:46:44 PM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 34 edited
- 4 copied
-
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
set to
/branches/2.0/plugins merged eligible /trunk/plugins merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/c13y_upgrade merged eligible /trunk/plugins/c13y_upgrade merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/c13y_upgrade/index.php merged eligible /trunk/plugins/c13y_upgrade/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade/initialize.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/c13y_upgrade/initialize.inc.php merged eligible /trunk/plugins/c13y_upgrade/initialize.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade/language
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/c13y_upgrade/language merged eligible /trunk/plugins/c13y_upgrade/language merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade/language/hu_HU
-
Property
svn:mergeinfo
set to
/trunk/plugins/c13y_upgrade/language/hu_HU merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade/language/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/c13y_upgrade/language/index.php merged eligible /trunk/plugins/c13y_upgrade/language/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/c13y_upgrade/main.inc.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/c13y_upgrade/main.inc.php merged eligible /trunk/plugins/c13y_upgrade/main.inc.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/plugins/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/plugins/index.php merged eligible /trunk/plugins/index.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.