Changeset 6276 for branches/2.1/admin/themes
- Timestamp:
- May 22, 2010, 11:48:17 AM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.1
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin
-
Property
svn:mergeinfo
set to
/branches/2.0/admin merged eligible /trunk/admin merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/themes
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes merged non-inheritable eligible /branches/2.0/admin/themes 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default merged non-inheritable eligible /branches/2.0/admin/themes/default 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/content.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/content.css merged eligible /branches/2.0/admin/themes/default/content.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/default-colors.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/default-colors.css merged eligible /branches/2.0/admin/themes/default/default-colors.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/default-layout.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/default-layout.css merged eligible /branches/2.0/admin/themes/default/default-layout.css 4963
r6000 r6276 830 830 background-repeat: no-repeat; 831 831 background-position: 5px 5px; 832 padding:5px 70px 0pt 30px;832 padding:5px 70px 0pt 53px; 833 833 min-height: 54px; 834 834 } -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/fix-ie5-ie6.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/fix-ie5-ie6.css merged eligible /branches/2.0/admin/themes/default/fix-ie5-ie6.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/index.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/index.php merged eligible /branches/2.0/admin/themes/default/index.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/layout.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/layout.css merged eligible /branches/2.0/admin/themes/default/layout.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/local-layout.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/local-layout.css merged eligible /branches/2.0/admin/themes/default/local-layout.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/local_head.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/local_head.tpl merged eligible /branches/2.0/admin/themes/default/local_head.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/menubar.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/menubar.css merged eligible /branches/2.0/admin/themes/default/menubar.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/picture.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/picture.css merged eligible /branches/2.0/admin/themes/default/picture.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/print.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/print.css merged eligible /branches/2.0/admin/themes/default/print.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/theme.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/theme.css merged eligible /branches/2.0/admin/themes/default/theme.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/themeconf.inc.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/themeconf.inc.php merged eligible /branches/2.0/admin/themes/default/themeconf.inc.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/thumbnails.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/thumbnails.css merged eligible /branches/2.0/admin/themes/default/thumbnails.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/uploadify.jGrowl.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/uploadify.jGrowl.css merged eligible /branches/2.0/admin/themes/default/uploadify.jGrowl.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.