Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8fe4433 authored by Jef Oliver's avatar Jef Oliver
Browse files

Merge branch 'ics' into ics-release

parents e7edbf2d 76a6452e

CHANGELOG.mkdn

+3 −61
Original line number Diff line number Diff line
@@ -7,66 +7,12 @@ Visit http://review.cyanogenmod.com for our Gerrit instance. 


Follow http://twitter.com/cmsrc for commit-by-commit updates.



Maintainers (CyanogenMod 9):

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

* Asus EeePad Transformer (tf101): Bumble-Bee, EnJens

* Asus EeePad Transformer Prime (tf201): Bumble-Bee, EnJens

* Asus EeePad Transformer Prime (tf300t): xplodwild

* Google Nexus S: KalimochoAz, burnsra

* Google Galaxy Nexus: KalimochoAz, bekit, Bumble-Bee

* HP Touchpad: dalingrin, green--, jcsullins

* LG Optimus LTE / AT&T Nitro HD: arcee

* LG Optimus Sol / LG myTouch: Kali-, arcee

* Motorola Xoom (stingray): TDR, Steady Hawkin, Bazar6 (Team Rogue)

* Motorola Xoom (wingray): TDR, Steady Hawkin, Bazar6 (Team Rogue)

* Samsung Epic 4G (SPH-D700): noobnl, Decad3nce, mkasick, UberPinguin, wtogami, bbelos (Team Epic)

* Samsung Fascinate (SCH-I500): sbrissen, jt1134

* Samsung Galaxy Note (GT-N7000): Entropy512, xplodwild

* Samsung Galaxy Note AT&T (SGH-I717): cyanogen

* Samsung Galaxy S (GT-I9000): pawitp

* Samsung Galaxy S II (GT-I9100): codeworkx, Unhelpful, xplodwild

* Samsung Galaxy S II (GT-I9100G): codeworkx

* Samsung Galaxy S II AT&T (SGH-I777): atinm, Entropy512

* Samsung Galaxy S II Skyrocket (SGH-I727): David Ferguson (dferg)

* Samsung Galaxy S II T-Mobile (SGH-T989): Mike Grissom (mikeyman77)

* Samsung Galaxy S III (GT-I9300): codeworkx, xplodwild

* Samsung Galaxy S III (SGH-I747 - AT&T): Unhelpful, cyanogen

* Samsung Galaxy S III (SGH-T999 - T-Mobile): cyanogen

* Samsung Galaxy S III (SPH-L710 - Sprint): noobnl, mkasick (Team Epic)

* Samsung Galaxy Tab 10.1: cyanogen, pershoot

* Samsung Galaxy Tab 8.9: kallt_kaffe

* Samsung Galaxy Tab 2 7" (GT-P31XX): codeworkx

* Samsung Galaxy Tab 2 10.1" (GT-P51XX): codeworkx

* Samsung Galaxy Tab 7: cdesai, humberos, jt1134

* Samsung Galaxy Tab 8.9: kallt_kaffe

* Samsung Galaxy Tab 10.1: cyanogen, pershoot

* Samsung Vibrant (SGH-T959): FaultException

* Sony Xperia Arc (LT15i): Bin4ry,defer,jerpelea (FreeXperia team)

* Sony Xperia Neo (MT15i): Bin4ry,defer,jerpelea (FreeXperia team)



Translators:

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

* German: Matthias Büchner, Alexander Hofbauer, Sebastian K (DerSeppel), Ricco Thiel, Andreas Böhm

* Italian: Francesco Foresta, Moreno Pojer, Eugenio Ziliotto, Giulio Cervera

* Japanese: Takuo Kitame

* French: Sébastien Vaucher, David Girault, Tanguy Pruvot

* Simplified Chinese: comercy, Qian Zheng

* Russian: OlegKrikun, Pavel Volkov, Kir Kolyshkin

* Portuguese: Eduardo Martins, Ricardo Pinho

* Portuguese-Brazil: Gustavo Rosa

* Spanish: PeRiJeY, KalimochoAz, Chuckycrx

* Catalan: Oriol Pellicer

* Finnish: Antti Leukkunen

* Swedish: Patrik Kullman

* Polish: Maciej Rozbicki

* Korean: Inseok Lee

* Traditional Chinese: Ladios Jonquil

* Slovak: Juraj Janecek

* Czech: Ondrej Zima



CHANGELOG (notable new features)

---------



### 9.1.0

* Common: Things and Stuff (I swear we will fill this out much better later on)



### 9.0.0

* Common: Android 4.0.4 (Google)
@@ -118,7 +64,6 @@ CHANGELOG (notable new features) 
* Common: "eat" pushes fresh brunch/breakfast to device - Ricardo Cerqueira

* Common: Customizable account color chip in Email - copolii

* Common: "Rings" lockscreen - Valera Trubachev



* Click, Motorola: Speed up photo recording - Emilio López

* Click, Motorola: Add Geolocation to photo app - KalimochoAz

* Click: Upgraded kernel from HTC 2.6.29 to 2.6.35
@@ -333,7 +278,6 @@ CHANGELOG (notable new features) 
* Vision: LED enhancement - Pershoot

* Droid: Kernel 2.6.32.9





### 6.0.0

* ANDROID: Google, HTC, Qualcomm, and everybody else.  We <3 U

* Common: ADWLauncher 1.1.4 - Ander Webbs
@@ -403,5 +347,3 @@ CHANGELOG (notable new features) 
* EVO: Sprint MMS fixes - Darchstar, toastcfh

* N1/Desire: True 720P encoding support - HTC, Cyanogen, Charan Singh, Enomther

* Desire: Kernel base from Kali- & Defer

CONTRIBUTORS.mkdn

0 → 100644
+78 −0
Original line number Diff line number Diff line 
CyanogenMod

===============



Maintainers (CyanogenMod 9):

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

* __Asus EeePad Transformer (TF101):__ Bumble-Bee, EnJens

* __Asus EeePad Transformer Prime (TF201):__ Bumble-Bee, EnJens

* __Asus EeePad Transformer Pad TF300T:__ xplodwild

* __Google Galaxy Nexus:__ , bekit, Bumble-Bee, burnsra, KalimochoAz

* __Google Nexus S:__ burnsra, KalimochoAz

* __HP Touchpad:__ dalingrin, green--, jcsullins

* __HTC Sensation:__ cretin45, intervigil

* __HTC One S:__ xkonni, intervigil

* __HTC One X:__ mdeejay, tbalden

* __HTC One XL:__ h8rift, intervigil

* __LG Optimus LTE (P930) / LG Nitro HD (P935):__ arcee

* __LG Optimus LTE (SK Telecom) (SU640):__ arcee

* __LG Optimus Sol (E730):__ arcee, Kali-

* __LG myTouch (E739):__ arcee, Kali-

* __LG myTouch Q / LG Eclypse (C800):__ chui101

* __Motorola Xoom (CDMA):__ Bazar6, Steady Hawkin, TDR (Team Rogue)

* __Motorola Xoom (Wi-Fi):__ Bazar6, Steady Hawkin, TDR (Team Rogue)

* __Samsung Captivate (SGH-I896 / SGH-I897):__ pawitp

* __Samsung Epic 4G (SPH-D700):__ bbelos, Decad3nce, mkasick, noobnl, UberPinguin (Team Epic)

* __Samsung Fascinate (SCH-I500):__ jt1134, sbrissen

* __Samsung Galaxy Note (GT-N7000):__ Entropy512, xplodwild

* __Samsung Galaxy Note (AT&T) (SGH-I717):__ cyanogen

* __Samsung Galaxy S (GT-I9000):__ pawitp

* __Samsung Galaxy S (GT-I9000B):__ helvio88

* __Samsung Galaxy S II (GT-I9100):__ codeworkx, Unhelpful, xplodwild

* __Samsung Galaxy S II (GT-I9100G):__ codeworkx

* __Samsung Galaxy S II (AT&T) (SGH-I777):__ atinm, Entropy512

* __Samsung Galaxy S II (T-Mobile) (SGH-T989):__ Mike Grissom (mikeyman77)

* __Samsung Galaxy S II Skyrocket (SGH-I727):__ David Ferguson (dferg)

* __Samsung Galaxy S III (GT-I9300):__ codeworkx, xplodwild

* __Samsung Galaxy S III (AT&T) (SGH-I747):__ cyanogen, Unhelpful

* __Samsung Galaxy S III (Sprint) (SPH-L710):__ mkasick, noobnl (Team Epic)

* __Samsung Galaxy S III (T-Mobile) (SGH-T999):__ cyanogen

* __Samsung Galaxy Tab 7:__ cdesai, humberos, jt1134

* __Samsung Galaxy Tab 8.9:__ kallt_kaffe

* __Samsung Galaxy Tab 10.1:__ cyanogen, pershoot

* __Samsung Galaxy Tab 2 7" (GT-P31xx):__ codeworkx

* __Samsung Galaxy Tab 2 10.1" (GT-P51xx):__ codeworkx

* __Samsung Vibrant (SGH-T959):__ FaultException

* __Sony Ericsson Live with Walkman (WT19i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Active (ST17i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Arc (LT15i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Mini (ST15i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Mini Pro (SK17i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Neo (MT15i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Neo V (MT11i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Play (CDMA) (R800x):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Play (GSM) (R800i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Pro (MK16i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Ericsson Xperia Ray (ST18i):__ Bin4ry, defer, jerpelea (FreeXperia team)

* __Sony Xperia Acro S (LT26w):__ Bin4ry, jerpelea, Kali-

* __Sony Xperia S (LT26i):__ Bin4ry, defer, jerpelea, Kali-



Translators:

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

* __Catalan:__ Oriol Pellicer

* __Czech:__ Ondrej Zima

* __Dutch:__ Marco Brohet, Kasper Hettinga, Sam Segers, Eddy Witkamp

* __Finnish:__ Antti Leukkunen

* __French:__ Sbastien Vaucher, David Girault, Tanguy Pruvot

* __German:__ Matthias Bchner, Alexander Hofbauer, Sebastian K (DerSeppel), Ricco Thiel, Andreas Bhm

* __Italian:__ Francesco Foresta, Moreno Pojer, Eugenio Ziliotto, Giulio Cervera

* __Japanese:__ Takuo Kitame

* __Korean:__ Inseok Lee

* __Polish:__ Maciej Rozbicki

* __Portuguese-Brazil:__ Gustavo Rosa

* __Portuguese:__ Eduardo Martins, Ricardo Pinho

* __Russian:__ OlegKrikun, Pavel Volkov, Kir Kolyshkin

* __Simplified Chinese:__ comercy, Qian Zheng

* __Slovak:__ Juraj Janecek

* __Spanish:__ PeRiJeY, KalimochoAz, Chuckycrx

* __Swedish:__ Patrik Kullman

* __Traditional Chinese:__ Ladios Jonquil
 
 No newline at end of file

config/common.mk

+4 −0
Original line number Diff line number Diff line
@@ -119,7 +119,11 @@ PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries 
PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/common



PRODUCT_VERSION_MAJOR = 9

<<<<<<< HEAD

PRODUCT_VERSION_MINOR = 0

=======

PRODUCT_VERSION_MINOR = 1

>>>>>>> ics

PRODUCT_VERSION_MAINTENANCE = 0



# Set CM_BUILDTYPE

jenkins-build-targets

+7 −1
Original line number Diff line number Diff line 
cm_anzu-userdebug

cm_c800-userdebug

cm_captivatemtd-userdebug

cm_coconut-userdebug

cm_crespo-userdebug
@@ -9,6 +10,8 @@ cm_d2tmo-userdebug 
cm_epicmtd-userdebug

cm_e730-userdebug

cm_e739-userdebug

cm_endeavoru-userdebug

cm_evita-userdebug

cm_fascinatemtd-userdebug

cm_galaxysbmtd-userdebug

cm_galaxysmtd-userdebug
@@ -16,6 +19,7 @@ cm_galaxys2-userdebug 
cm_haida-userdebug

cm_hallon-userdebug

cm_hercules-userdebug

cm_hikari-userdebug

cm_i777-userdebug

cm_i9100g-userdebug

cm_i9300-userdebug
@@ -26,6 +30,8 @@ cm_n7000-userdebug 
cm_nozomi-userdebug

cm_p1-userdebug

cm_p1c-userdebug

cm_p1l-userdebug

cm_p1n-userdebug

cm_p3-userdebug

cm_p3100-userdebug

cm_p3110-userdebug
@@ -46,7 +52,6 @@ cm_satsuma-userdebug 
cm_shooter-userdebug

cm_shooteru-userdebug

cm_skyrocket-userdebug

cm_smb_a1011-userdebug

cm_smultron-userdebug

cm_stingray-userdebug

cm_su640-userdebug
@@ -58,6 +63,7 @@ cm_toro-userdebug 
cm_toroplus-userdebug

cm_urushi-userdebug

cm_vibrantmtd-userdebug

cm_ville-userdebug

cm_wingray-userdebug

cm_zeus-userdebug

cm_zeusc-userdebug