Changeset 18520
- Timestamp:
- 2010/02/01 13:02:00 (13 years ago)
- bzr:base-revision:
- ohkouchi@loop-az.jp-20100201035235-qiffrxrmlg6caavg
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/default/admin/contents/inquiry.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fcontents%2Finquiry.tpl
data/Smarty/templates/default/mobile/top.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fmobile%2Ftop.tpl
data/class/SC_CheckError.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CheckError.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php 15662@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Inquiry.php
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
html/user_data/packages/default/css/index.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Findex.css- bzr:mapping-version:
- v4
- bzr:merge:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18471- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20100201040155-mkdcbmh8hdp42xf3
- bzr:revno:
- 1891
- bzr:revprop:branch-nick:
- branches/version-2_4
- bzr:root:
- branches/version-2_4
- bzr:text-parents:
data/Smarty/templates/default/admin/contents/inquiry.tpl ohkouchi@loop-az.jp-20100201035235-qiffrxrmlg6caavg svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18469
data/Smarty/templates/default/mobile/top.tpl ohkouchi@loop-az.jp-20100201034421-94iy72ax1bexmnnv svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18468
data/class/SC_CheckError.php ohkouchi@loop-az.jp-20100201032922-cg71x9egaxhw2cfo svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18466
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20100201031639-ti7ylim4f7vkh5mq svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18465
data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php ohkouchi@loop-az.jp-20100201035235-qiffrxrmlg6caavg svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18470
data/class/pages/products/LC_Page_Products_Detail.php ohkouchi@loop-az.jp-20100201031639-ti7ylim4f7vkh5mq svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18465
data/class/pages/products/LC_Page_Products_List.php ohkouchi@loop-az.jp-20100201031639-ti7ylim4f7vkh5mq svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18465
html/user_data/packages/default/css/index.css svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2:17250- bzr:text-revisions:
html/user_data/packages/default/css/index.css svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_4-dev:18471- bzr:timestamp:
- 2010-02-01 13:01:55.891000032 +0900
- bzr:user-agent:
- bzr2.0.3+bzr-svn1.0.1
- svn:original-date:
- 2010-02-01T04:01:55.891000Z
- Location:
- branches/version-2_4
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_4
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/version-2_4-dev merged eligible /branches/version-2_4/version-2_4 18444 /branches/version-2_4/version-2_4-dev 18445
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/version-2_4/html/user_data/packages/default/css/index.css
r17250 r18520 51 51 div.recomendleft { 52 52 float: left; 53 width: 190px; 53 54 margin: 0 5px 0 0; 54 55 }
Note: See TracChangeset
for help on using the changeset viewer.