User: jmburnz Branch: HEAD Date: Fri, 04 Jun 2010 21:30:05 +0000 Modified files: /themes/adaptivetheme/adaptivetheme README.txt adaptivetheme.info /themes/adaptivetheme/adaptivetheme/css base-rtl.css base.css /themes/adaptivetheme/adaptivetheme/css/core-images arrow_down.png arrow_up.png configure.png edit.png layout-default.png layout-sidebars-left.png layout-sidebars-right.png openid.png search-button-tile.png status-error.png status-info.png status-ok.png status-warning.png up-down.png warning-small.png /themes/adaptivetheme/adaptivetheme/gpanels 2col-2x50.php 2col-33-66.php 2col-66-33.php 3col-25-25-50.php 3col-3x33.php 3col-50-25-25.php 4col-4x25.php 5col-5x20.php 6col-6x16.php README.txt /themes/adaptivetheme/adaptivetheme/inc template.block-editing.inc template.custom-functions.inc template.preprocess-block.inc template.preprocess-comment-wrapper.inc template.preprocess-comment.inc template.preprocess-node.inc template.preprocess-page.inc template.preprocess-search-result.inc template.theme-js.inc template.theme-overrides.inc template.theme-settings.inc /themes/adaptivetheme/adaptivetheme/js README.txt at-scripts.js equalize-blocks.js equalize-columns.js equalize-gpanels.js jquery.overlabel.js jquery.supersleight.js preloadCssImages.jQuery_v5.js /themes/adaptivetheme/adaptivetheme logo.png /themes/adaptivetheme/adaptivetheme/panels README.txt /themes/adaptivetheme/adaptivetheme/panels/fivecol_5x20 fivecol-5x20.tpl.php fivecol_5x20.css fivecol_5x20.inc fivecol_5x20.png /themes/adaptivetheme/adaptivetheme/panels/fourcol_4x25 fourcol-4x25.tpl.php fourcol_4x25.css fourcol_4x25.inc fourcol_4x25.png /themes/adaptivetheme/adaptivetheme/panels/sixcol_6x16 sixcol-6x16.tpl.php sixcol_6x16.css sixcol_6x16.inc sixcol_6x16.png /themes/adaptivetheme/adaptivetheme/panels/threecol_at_25_25_50 threecol-at-25-25-50.tpl.php threecol_at_25_25_50.css threecol_at_25_25_50.inc threecol_at_25_25_50.png /themes/adaptivetheme/adaptivetheme/panels/threecol_at_50_25_25 threecol-at-50-25-25.tpl.php threecol_at_50_25_25.css threecol_at_50_25_25.inc threecol_at_50_25_25.png /themes/adaptivetheme/adaptivetheme/panels/threecol_at_stacked_inset threecol-at-stacked-inset.tpl.php threecol_at_stacked_inset.css threecol_at_stacked_inset.inc threecol_at_stacked_inset.png /themes/adaptivetheme/adaptivetheme/panels/twocol_at_33_66 twocol-at-33-66.tpl.php twocol_at_33_66.css twocol_at_33_66.inc twocol_at_33_66.png /themes/adaptivetheme/adaptivetheme/panels/twocol_at_66_33 twocol-at-66-33.tpl.php twocol_at_66_33.css twocol_at_66_33.inc twocol_at_66_33.png /themes/adaptivetheme/adaptivetheme/panels/twocol_at_stacked_inset twocol-at-stacked-inset.tpl.php twocol_at_stacked_inset.css twocol_at_stacked_inset.inc twocol_at_stacked_inset.png /themes/adaptivetheme/adaptivetheme screenshot.png template.php /themes/adaptivetheme/adaptivetheme/templates README.txt block.tpl.php box.tpl.php comment-wrapper.tpl.php comment.tpl.php content-field.tpl.php maintenance-page.tpl.php node-og-group-post.tpl.php node-og-group.tpl.php node.tpl.php page.tpl.php panels-pane.tpl.php search-result.tpl.php user-picture.tpl.php views-view-fields.tpl.php views-view-grid.tpl.php views-view-list.tpl.php views-view-table.tpl.php views-view-unformatted.tpl.php views-view.tpl.php /themes/adaptivetheme/adaptivetheme theme-settings.php /themes/adaptivetheme/adaptivetheme_admin adaptivetheme_admin.info /themes/adaptivetheme/adaptivetheme_admin/css/core at-admin-rtl.css at-admin.css /themes/adaptivetheme/adaptivetheme_admin/css/core/core-images blue-button.png gray-grad.png gray-grad2.png green-button.png red-button.png search-button-tile.png shadow.png /themes/adaptivetheme/adaptivetheme_admin/css/theme amber.css colors-default.css emerald.css ruby.css saphire.css /themes/adaptivetheme/adaptivetheme_admin logo.png screenshot.png template.php /themes/adaptivetheme/adaptivetheme_admin/templates page.tpl.php /themes/adaptivetheme/adaptivetheme_admin theme-settings.php /themes/adaptivetheme/adaptivetheme_subtheme README.txt adaptivetheme_subtheme.info /themes/adaptivetheme/adaptivetheme_subtheme/css/core dark.css gpanels-960-fixed-rtl.css gpanels-960-fixed.css gpanels-fluid-rtl.css gpanels-fluid.css /themes/adaptivetheme/adaptivetheme_subtheme/css/ie ie-lte-7-rtl.css ie-lte-7.css /themes/adaptivetheme/adaptivetheme_subtheme/css/theme README.txt starter-rtl.css starter.css theme.css /themes/adaptivetheme/adaptivetheme_subtheme logo.png screenshot.png template.php theme-settings.php Log message: re add files to head, since the mistake with the merge went wrong Links: http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt... http://cvs.drupal.org/diff.php?path=contributions/themes/adaptivetheme/adapt...