Merge "heroc/Gallery3D: Remove DIRTY UGLY HACK from Gallery3D Overlay" into froyo
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 95c88bb..6ef47f1 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -57,6 +57,7 @@
 * Common: Quick PIN unlock - gsarrica
 * Common: Increase performance of Gallery3D caching system - Androbot
 * Common: Gallery3D bugfixes and improvements - CodeAurora
+* Common: Gallery3D highres patches - Petar Šegina
 * Common: Skia performance enhancements - CodeAurora
 * Common: APN list update - Paul Weiss
 * Common: Fix AGPS issues on all platforms
@@ -65,13 +66,15 @@
 * Common: Enabled Sound Recorder app
 * Common: Bluetooth OBEX performance boost - Sony
 * Common: Updated Terminal Emulator app - Jack Palevich
-* N1/Bravo/Supersonic: FM Radio support - MIUI - http://miui.com (graphics from Fitsnugly and HaXzAmaTiC)
+* Common: Updated headset drawables - blunden
+* N1/Bravo/Supersonic: FM Radio support - MIUI - http://miui.com (graphics from Fitsnugly, HaXzAmaTiC, and blunden)
 * N1/DS - Kernel 2.6.35 based on Pershoot's repository
 * DS: Updated hardware drivers from official release
 * DS: CompCache sizes can be adjusted through CMParts - Wes Garner
 * Supersonic - Kernel 2.6.34 courtesy of Toast and Madcoder
 * Bravo: Kernel 2.6.35
 * Espresso: Improve backlights - Wes Garner
+* Espresso: Kernel OC patch - dumfuq (no OC by default)
 * Legend/Supersonic: Proper notification light support - Alex Hofbauer
 
 ** Note on Email update: This requires a one-time wipe of application settings.
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index c4ab4e5..9089bdd 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -42,7 +42,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Desire
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Desire
+        ro.modversion=CyanogenMod-6.1.0-RC1-Desire
 endif
 
 #
diff --git a/products/cyanogen_bravoc.mk b/products/cyanogen_bravoc.mk
index 73b3b57..a43c0dc 100644
--- a/products/cyanogen_bravoc.mk
+++ b/products/cyanogen_bravoc.mk
@@ -31,7 +31,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-BravoC
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-BravoC
+        ro.modversion=CyanogenMod-6.1.0-RC1-BravoC
 endif
 
 #
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index f1c3ba6..8eb7456 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -41,7 +41,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-DS
+        ro.modversion=CyanogenMod-6.1.0-RC1-DS
 endif
 
 # Use the audio profile hack
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index afafeda..0305d9f 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -34,7 +34,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Slide
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Slide
+        ro.modversion=CyanogenMod-6.1.0-RC1-Slide
 endif
 
 #
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index b6b5556..55b2385 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -30,7 +30,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Hero
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Hero
+        ro.modversion=CyanogenMod-6.1.0-RC1-Hero
 endif
 
 #
diff --git a/products/cyanogen_heroc.mk b/products/cyanogen_heroc.mk
index d4d5d41..9de3647 100644
--- a/products/cyanogen_heroc.mk
+++ b/products/cyanogen_heroc.mk
@@ -26,7 +26,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Heroc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-	 ro.modversion=CyanogenMod-6.1.0-RC0-Heroc
+	 ro.modversion=CyanogenMod-6.1.0-RC1-Heroc
 endif
 
 #
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index 2f4bfa6..93789de 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -26,7 +26,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Inc
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.2-Inc
+        ro.modversion=CyanogenMod-6.1.0-RC1-Inc
 endif
 
 #
diff --git a/products/cyanogen_legend.mk b/products/cyanogen_legend.mk
index d9f4c78..addb985 100644
--- a/products/cyanogen_legend.mk
+++ b/products/cyanogen_legend.mk
@@ -30,7 +30,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Legend
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Legend
+        ro.modversion=CyanogenMod-6.1.0-RC1-Legend
 endif
 
 #
diff --git a/products/cyanogen_liberty.mk b/products/cyanogen_liberty.mk
index 2a9e3f5..16f7f0b 100644
--- a/products/cyanogen_liberty.mk
+++ b/products/cyanogen_liberty.mk
@@ -27,7 +27,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Liberty
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Liberty
+        ro.modversion=CyanogenMod-6.1.0-RC1-Liberty
 endif
 
 #
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 3f3a0be..c90a63f 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -44,7 +44,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-N1
+        ro.modversion=CyanogenMod-6.1.0-RC1-N1
 endif
 
 #
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index f3f3e16..3e4d3f8 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -21,7 +21,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Droid
+        ro.modversion=CyanogenMod-6.1.0-RC1-Droid
 endif
 
 PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG22D BUILD_DISPLAY_ID=FRG22D PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRG22D/50454:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRG22D 50454 release-keys" BUILD_NUMBER=50454 BUILD_UTC_DATE=1278333946 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
diff --git a/products/cyanogen_supersonic.mk b/products/cyanogen_supersonic.mk
index 56faa27..47cc9c8 100644
--- a/products/cyanogen_supersonic.mk
+++ b/products/cyanogen_supersonic.mk
@@ -30,7 +30,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Supersonic
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC0-Supersonic
+        ro.modversion=CyanogenMod-6.1.0-RC1-Supersonic
 endif
 
 #