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

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

Commits:

3efd8eb by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Use a simple "git describe".
    
    This matches the behavior of the master branch.
    
    Reviewed-on: https://code.wireshark.org/review/1125
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 917525764723062cbd1ba54c302f81aaff856638)
    
    Conflicts:
    	make-version.pl
    
    Change-Id: Iea987cd5ce5b5b18ca331cc77c1bce6683970934
    Reviewed-on: https://code.wireshark.org/review/1126
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  7e25d92   [Automatic manuf, services and enterprise-numbers update for 2014-04-13]
    adds  3efd8eb   Use a simple "git describe".


Summary of changes:
 make-version.pl |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)