commit 7f3e321ea9e2416083c292290b041fc137094ca9
author Steve Kondik <shade@chemlab.org> Mon Dec 06 01:45:22 2010 +0000
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> Mon Dec 06 01:45:22 2010 +0000
tree fb9624b6b039cd69c87f4fdd146285bb671f418f
parent fa8514432d65f9ad863a327ff437a35ceba6aeb0
parent dcf6639c00d1c8d136a17bd2c7938c84fde80287

Merge "espresso: Enable dual-led mode for notifications" into froyo

CHANGELOG.mkdn

diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 1c35294..727988b 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -38,7 +38,7 @@
 * Russian: OlegKrikun, Pavel Volkov
 * Portuguese: Eduardo Martins
 * Spanish: PeRiJeY, KalimochoAz
-
+* Catalan: Oriol Pellicer
 
 CHANGELOG
 ---------

products/cyanogen_one.mk

diff --git a/products/cyanogen_one.mk b/products/cyanogen_one.mk
index 4edbd16..0bdbd7b 100644
--- a/products/cyanogen_one.mk
+++ b/products/cyanogen_one.mk
@@ -33,7 +33,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-ONE
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC1-ONE
+        ro.modversion=CyanogenMod-6.1.0-ONE
 endif
 
 #

products/cyanogen_z71.mk

diff --git a/products/cyanogen_z71.mk b/products/cyanogen_z71.mk
index 7c6b66e..4a3df2a 100644
--- a/products/cyanogen_z71.mk
+++ b/products/cyanogen_z71.mk
@@ -27,7 +27,7 @@
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Z71
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.1.0-RC2-Z71
+        ro.modversion=CyanogenMod-6.1.0-Z71
 endif
 
 #