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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=146485d11f5821205e547edec39cbc3e34f7a06d
Submitter: Alexis La Goutte (alexis.lagoutte@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

146485d by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Add CMakeLists.txt.user* to .gitignore.
    
    Qt Creator uses CMakeLists.txt.user to store CMake build settings.
    
    Change-Id: I600289183dcfbc03cd9b555c4b646e6cfb799b0e
    Reviewed-on: https://code.wireshark.org/review/11700
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit ec303c13b3f8df1feeae449830f57f20660229eb)
    Reviewed-on: https://code.wireshark.org/review/11710
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  4905d2b   [Automatic update for 2015-11-08]
    adds  146485d   Add CMakeLists.txt.user* to .gitignore.


Summary of changes:
 .gitignore |    1 +
 1 file changed, 1 insertion(+)