[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-146-gb34584a

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  b34584acf1eb229c026d8ad94d8e15496500be15 (commit)
      from  72e45d85a2dee3442a55f05e644ac4ddd977ed2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=b34584acf1eb229c026d8ad94d8e15496500be15


commit b34584acf1eb229c026d8ad94d8e15496500be15
Author: Daniele Forsi <address@hidden>
Date:   Tue Dec 15 18:26:45 2009 +0100

    Add id RM-260 for Nokia 6085 thanks to Peter Whittaker on Launchpad
    
    Fixes https://bugs.launchpad.net/ubuntu/+source/gnokii/+bug/496946

diff --git a/ChangeLog b/ChangeLog
index fce3b27..bc88d42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,9 +38,10 @@
                                                         (Paweł Kot)
  * libgnokii updates
     o add more debug information to encoding functions  (Paweł Kot)
-    o add ids for Nokia 2760, Nokia 5130 XpressMusic and Nokia 5310
-      XpressMusic to misc.c (use model=series40 for all)
-                   (Jaakko Saarinen, Gustavo Delfino, pier_andreit)
+    o add ids for Nokia 2760, Nokia 5130 XpressMusic, Nokia 5310
+      XpressMusic and Nokia 6085 to misc.c (use model=series40 for
+      all)         (Jaakko Saarinen, Gustavo Delfino, pier_andreit,
+                                                   Peter Whittaker)
     o add TA and CB memory types to gn_str2memory_type() and to
       gn_memory_type2str(); they were only in
       gn_memory_type_print()                        (Daniele Forsi)
diff --git a/common/misc.c b/common/misc.c
index 31b6869..b05a02d 100644
--- a/common/misc.c
+++ b/common/misc.c
@@ -213,6 +213,7 @@ static gn_phone_model models[] = {
        {"6080",  "NME-2",      PM_OLD_DEFAULT },
        {"6081",  "NME-2A",     PM_OLD_DEFAULT },
        {"6081",  "NME-2E",     PM_OLD_DEFAULT },
+       {"6085",  "RM-260",     PM_DEFAULT },
        {"6090",  "NME-3",      PM_OLD_DEFAULT },
        {"6100",  "NPL-2",      PM_DEFAULT | PM_XGNOKIIBREAKAGE },
        {"6108",  "RH-4",       PM_OLD_DEFAULT },

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

Summary of changes:
 ChangeLog     |    7 ++++---
 common/misc.c |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs