![(please configure the [header_logo] section in trac.ini)](http://piwigo.org/screenshots/piwigo_logo_on_white.png){kind=logo}
Changeset 6333
- Timestamp:
- 05/24/10 17:46:44 (3 years ago)
- Location:
- branches/2.1
- Files:
-
- 34 modified
- 4 copied
-
. (modified) (1 prop)
-
about.php (modified) (1 prop)
-
action.php (modified) (1 prop)
-
admin.php (modified) (1 prop)
-
category.php (modified) (1 prop)
-
comments.php (modified) (1 prop)
-
feed.php (modified) (1 prop)
-
identification.php (modified) (1 prop)
-
index.php (modified) (1 prop)
-
install.php (modified) (1 prop)
-
nbm.php (modified) (1 prop)
-
notification.php (modified) (1 prop)
-
password.php (modified) (1 prop)
-
picture.php (modified) (1 prop)
-
plugins (modified) (1 prop)
-
plugins/c13y_upgrade (modified) (1 prop)
-
plugins/c13y_upgrade/index.php (modified) (1 prop)
-
plugins/c13y_upgrade/initialize.inc.php (modified) (1 prop)
-
plugins/c13y_upgrade/language (modified) (1 prop)
-
plugins/c13y_upgrade/language/hu_HU (copied) (copied from trunk/plugins/c13y_upgrade/language/hu_HU) (1 prop)
-
plugins/c13y_upgrade/language/hu_HU/description.txt (copied) (copied from trunk/plugins/c13y_upgrade/language/hu_HU/description.txt)
-
plugins/c13y_upgrade/language/hu_HU/index.php (copied) (copied from trunk/plugins/c13y_upgrade/language/hu_HU/index.php)
-
plugins/c13y_upgrade/language/hu_HU/plugin.lang.php (copied) (copied from trunk/plugins/c13y_upgrade/language/hu_HU/plugin.lang.php)
-
plugins/c13y_upgrade/language/index.php (modified) (1 prop)
-
plugins/c13y_upgrade/main.inc.php (modified) (1 prop)
-
plugins/index.php (modified) (1 prop)
-
popuphelp.php (modified) (1 prop)
-
profile.php (modified) (1 prop)
-
qsearch.php (modified) (1 prop)
-
random.php (modified) (1 prop)
-
register.php (modified) (1 prop)
-
search.php (modified) (1 prop)
-
search_rules.php (modified) (1 prop)
-
tags.php (modified) (1 prop)
-
upgrade.php (modified) (1 prop)
-
upgrade_feed.php (modified) (1 prop)
-
upload.php (modified) (1 prop)
-
ws.php (modified) (1 prop)
-
branches/2.1
- Property svn:mergeinfo
-
old new 1 1 /branches/2.0:4963,4965*,5001*,5013* 2 /trunk:6240*,6265-6268*,6271*,63 20*2 /trunk:6240*,6265-6268*,6271*,6317*,6320*
-
- Property svn:mergeinfo
-
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 4963 /trunk/plugins 6317*
-
Property
svn:mergeinfo set
to
-
branches/2.1/plugins/c13y_upgrade
-
Property
svn:mergeinfo set
to
/branches/2.0/plugins/c13y_upgrade 4963 /trunk/plugins/c13y_upgrade 6317*
-
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 4963 /trunk/plugins/c13y_upgrade/language 6317*
-
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 6317*
-
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
/trunk/upload.php merged: 6317
- Property svn:mergeinfo changed
-
branches/2.1/ws.php
- Property svn:mergeinfo changed (with no actual effect on merging)
