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

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

Commits:

68a40b7 by Gerald Combs (gerald@xxxxxxxxxxxxx):

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

Actions performed:

    from  4295fb3   ui/gtk/mcast_stream.c: Add dependency on sys/time.h for struct timeval
    adds  68a40b7   [Automatic update for 2015-05-17]


Summary of changes:
 epan/enterprise-numbers |  178 ++++++++++++++++++++++++++++++++++++++++++-----
 epan/sminmpec.c         |   46 ++++++++++--
 manuf                   |   42 ++++++++++-
 services                |    2 -
 4 files changed, 241 insertions(+), 27 deletions(-)