The branch, master has been updated via 489e8f128578972ba6b92bd05c7c7caae95a8bd4 (commit) via 07fde2dc1c3dd48c2c968b93b4b9531f59f4c6d1 (commit) from 4d19ddaf0852e0f727bcd1224fe6d3f6b16f3dd2 (commit)

- Log ----------------------------------------------------------------- commit 489e8f128578972ba6b92bd05c7c7caae95a8bd4 Merge: 4d19ddaf0852e0f727bcd1224fe6d3f6b16f3dd2 07fde2dc1c3dd48c2c968b93b4b9531f59f4c6d1 Author: Michal Čihař mcihar@suse.cz Date: Mon Jul 25 17:17:33 2011 +0200

Merge remote-tracking branch 'tyron/master'

Conflicts: themes/pmahomme/css/theme_left.css.php

commit 07fde2dc1c3dd48c2c968b93b4b9531f59f4c6d1 Author: Tyron Madlener tyronx@gmail.com Date: Mon Jul 25 17:54:09 2011 +0300

Added missing create table icon in left frame

-----------------------------------------------------------------------

Summary of changes: themes/original/css/theme_left.css.php | 1 + themes/pmahomme/css/theme_left.css.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index f1b6ef8..5cd64b0 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -89,6 +89,7 @@ button { .ic_b_view { background-position: 0 -1044px; } .ic_b_minus { background-position: 0 -440px; width: 9px; height: 9px; } .ic_b_plus { background-position: 0 -523px; width: 9px; height: 9px; } +.ic_b_snewtbl { background-position: 0 -726px; width: 10px; height: 10px; }

/******************************************************************************/ /* classes */ diff --git a/themes/pmahomme/css/theme_left.css.php b/themes/pmahomme/css/theme_left.css.php index 247df08..89a7efb 100644 --- a/themes/pmahomme/css/theme_left.css.php +++ b/themes/pmahomme/css/theme_left.css.php @@ -96,6 +96,7 @@ button { .ic_b_minus { background-position: -471px 0; }

.ic_b_views, .ic_s_views { background-position: -1094px 0; } +.ic_b_snewtbl { background-position: -788px 0; }

/******************************************************************************/ /* classes */

hooks/post-receive