[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=de26aed2ac2b03df10444f89e908ae65553474af
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

de26aed by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [Automatic update for 2015-06-21]
    
    Update manuf, services enterprise-numbers, translations, and other items.
    
    Change-Id: I0ed2254f7051ce999a0c124fd00bfa794bcd1557
    Reviewed-on: https://code.wireshark.org/review/9013
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  49bc1a9   print.c: display BASE_HEX_DEC integers as hexadecimal
    adds  de26aed   [Automatic update for 2015-06-21]


Summary of changes:
 epan/enterprise-numbers |  692 +++++++++++++++++++++++++++++------------------
 epan/sminmpec.c         |  546 ++++++++++++++++++++-----------------
 manuf                   |   43 ++-
 services                |    5 +-
 4 files changed, 757 insertions(+), 529 deletions(-)