merge master

diff --git a/EarlyBlue/chatzilla/channels.css b/EarlyBlue/chatzilla/channels.css
index e5fb6ca02b6ecabd143c7e6f38f243b09d519525..e4a553b9e6c61bae1c01fefb83561234fe224fe2 100644 (file)
--- a/EarlyBlue/chatzilla/channels.css
+++ b/EarlyBlue/chatzilla/channels.css
@@ -41,6 +41,10 @@
        width: 12em;
 }
 
+.platform-Mac #rightPanel {
+       width: 18em;
+}
+
 #loadContainer {
        margin: 0;
 }

diff --git a/LCARStrek/chatzilla/channels.css b/LCARStrek/chatzilla/channels.css
index e5fb6ca02b6ecabd143c7e6f38f243b09d519525..e4a553b9e6c61bae1c01fefb83561234fe224fe2 100644 (file)
--- a/LCARStrek/chatzilla/channels.css
+++ b/LCARStrek/chatzilla/channels.css
@@ -41,6 +41,10 @@
        width: 12em;
 }
 
+.platform-Mac #rightPanel {
+       width: 18em;
+}
+
 #loadContainer {
        margin: 0;
 }

diff --git a/origdiff b/origdiff
index 4acd26818bd0cbe0ebff6598408d8407efe56b47..f4c391e069495be0400994c83e1ac6d1ce74604b 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -10,25 +10,31 @@ if [ -n "$1" ]; then
   SRC_DATE="$1"
   DST_DATE=`TZ=America/Los_Angeles date +%Y-%m-%d`
 
-  HG_COMM_DIR=/mnt/mozilla/hg/comm-central
+  HG_COMM_DIR=/mnt/mozilla/hg/comm-1.9.1
+  COMM_HG_OPTIONS=
   COMM_DIR=suite/themes/classic/
   COMM_LOG=$RUN_DIR/themelog-suitedefault.$SRC_DATE.$DST_DATE.log
 
-  HG_MOZ_DIR=/mnt/mozilla/hg/comm-central/mozilla
+  HG_MOZ_DIR=/mnt/mozilla/hg/comm-1.9.1/mozilla
+  MOZ_HG_OPTIONS=
   MOZ_DIR=toolkit/themes/winstripe/
   MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
 
-  HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector
+  HG_DOMI_DIR=/mnt/mozilla/hg/comm-1.9.1/mozilla/extensions/inspector
+  DOMI_HG_OPTIONS="-b COMM_1_9_1_BRANCH"
   DOMI_DIR=resources/skin/classic/
   DOMI_LOG=$RUN_DIR/themelog-domiclassic.$SRC_DATE.$DST_DATE.log
 
-  HG_CZ_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/irc
+  HG_CZ_DIR=/mnt/mozilla/hg/comm-1.9.1/mozilla/extensions/irc
+  CZ_HG_OPTIONS="-b COMM_1_9_1_BRANCH"
   CZ_DIR=xul/skin/
   CZ_LOG=$RUN_DIR/themelog-chatzilla.$SRC_DATE.$DST_DATE.log
 
   for repo in $REPO_LIST; do
     HG_DIR_VAR="HG_${repo}_DIR"
     HG_DIR=${!HG_DIR_VAR}
+    HG_OPTIONS_VAR="${repo}_HG_OPTIONS"
+    HG_OPTIONS=${!HG_OPTIONS_VAR}
     SKIN_DIR_VAR="${repo}_DIR"
     SKIN_DIR=${!SKIN_DIR_VAR}
     LOG_VAR="${repo}_LOG"
@@ -36,7 +42,7 @@ if [ -n "$1" ]; then
     if [ ! -e $LOG_NAME ]; then
       echo "Getting $LOG_NAME..."
       cd $HG_DIR
-      LC_ALL=C hg log -d ">$SRC_DATE" $SKIN_DIR > $LOG_NAME
+      LC_ALL=C hg log -d ">$SRC_DATE" $HG_OPTIONS $SKIN_DIR > $LOG_NAME
     fi
   done
   cd $RUN_DIR