Author: snoopdave Date: Sun Apr 20 13:33:47 2014 New Revision: 1588756 URL: http://svn.apache.org/r1588756 Log: Merged from trunk using this command:
svn merge -r 1546817:HEAD https://svn.apache.org/repos/asf/roller/trunk . Added: roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/ - copied from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/ roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ - copied from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/animated-overlay.gif - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/animated-overlay.gif roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_flat_30_cccccc_40x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_flat_30_cccccc_40x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_3d3d3d_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_3d3d3d_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_bd7b00_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_bd7b00_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_d19405_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_d19405_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_eb990f_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_eb990f_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_ed9f26_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_ed9f26_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_fadc7a_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_fadc7a_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_ffe180_256x240.png - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/images/ui-icons_ffe180_256x240.png roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/jquery-ui-1.10.4.custom.min.css roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/jquery.ui.all.css - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/jquery.ui.all.css roller/branches/rome2/app/src/main/webapp/roller-ui/theme/sunny/jquery.ui.base.css - copied unchanged from r1588713, roller/trunk/app/src/main/webapp/roller-ui/theme/sunny/jquery.ui.base.css Removed: roller/branches/rome2/app/src/main/java/org/apache/roller/weblogger/webservices/adminprotocol/ roller/branches/rome2/app/src/main/resources/org/apache/roller/weblogger/webservices/adminprotocol/ roller/branches/rome2/app/src/test/resources/sql/
