# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # 3wbk2tv3sfjnnjvc # target_branch: http://bzr.savannah.gnu.org/r/gnash/trunk/ # testament_sha1: bd114772c8eb3cf236dea5cddc25d144d6a86450 # timestamp: 2009-07-27 14:41:31 -0600 # source_branch: bzr+ssh://bzr.elkriverranch.com/code/Gnash/trunk # base_revision_id: address@hidden # bnlmb54hw5q4y2he # # Begin patch === modified file 'utilities/findwebcams.cpp' --- utilities/findwebcams.cpp 2009-07-23 22:54:22 +0000 +++ utilities/findwebcams.cpp 2009-07-26 09:13:11 +0000 @@ -43,7 +43,7 @@ data::data() { deviceName = NULL; deviceType = NULL; - gint deviceNumber = -1; + deviceNumber = -1; duplicate = false; }; # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSPofGYAAejfgGAQUW///3/v /5C////wUASavAPb3j2mnoF7A0SE8U9R6mg1PUG9UzU9Gp6mgaBoyHqeoeoeptQDSRPSZHlBtQaa aAAAANAAAADRT0TBKNjVPKYmyQHqAAGQaA0AAJTSp6T0U/KmmQDQ00DQAaMgNAABoCSgjQhgmKYN EJ5DIBqDKek08UaeiemSI8FGM9OoMGdXUTJ0v6ONxKBkh232aCqC5mAhYuCCTFBTTwla+YbV7cCo TBnVSVVcClmiE3jQyWcdQR2FQiVqaaW1R/WvDVZw0zlRftKgeYmkg5QHRRDZtr960GG07rAUi60E aNS9+zD08FO4QfNa12k359bT9UAs04ElwbTXkq9YZGR8YlOuzWgrOi/6Iy0craoCrob0O/4YAVOI nH02JLaPKTA1JQAsJWHB14D48VCTPWQCf2hPMA0NulhZUSAfW0ZgCSsrbTKW6mkrcNbjN71OiJo0 AzCZDJOHNG2mYnQ2lTOAwA9FnZIcWgOgCFMzZQJ3URHAZTHhMjiW6GcfcQOc0AZAHYjPgMpipCus 0FBDMqiUqOVpMEh4vLsIM9wxYKsOi9mO91+MxhZmxvCgijUbp3lmIwm/9ycISSZaxtpQBlHmBhDC TYi8xwyKkyKRFBTZSHkE3mOJmbOiFPO5AuwHIxhVKJmXm4UJAsNy49YLoFLyIoGAJgmq8RFQY5wO 7fZFQs2tPZCTmIOAHUHCDDDwdwCSYFpMKNKq800F7BlzKERkvLQJ+h5KAk0PLBDIBin+9nx+oFW1 kJgW0F6Dk12/Oj6fuapLoSbIOUXK7LBR2vbGjaVcBTeXFjhuoLALNF12uPdmbpwBLBhMZpB+OfL3 32Fedf6fUao9BqAiv1LAlkEblHFzlpYA5DkdXfFxs8ByN5DHE3B4m88g+cRxfyTjUfdC7ytPbJIg EwmIIwIIIkvoLRDovu0woIDICiWAyunI4DYmeYHkF3wxiPMJgYE154fcxryNJq3ZXJFrJv14oXCx cT4Qcg0lUR5jOQ8yRXf3AKiBEUCnlGYvWXYRvkiWW9Pl4zxPtUKg5C1qHsH8kwPMGQEEeD7c4zk1 ycYdwDTKnWsKk2xMFxhNZRHz92gNCeRM7pCZBcRBFozM3F5pHl5nI9/tYREhSfjZs5PqzIBseHDy Frw77Euo3MFjHtzSYQxKSacIhxBZawsGCuELqvD7CYMy1/I5oLWS2oX76UF6jXXZMGZESx0bsUD/ fzwwfSItQWE+1iHsPh8aAOWAHCRAeo7b3XIbmNiFfOEQTPQtbORqgqDAGMo5KzO5C6dIMAcnhJ0M ZMEozg256RzMNsdIxPegYDJFiePAewLT5NrAnyh4gbYqkMYLyaF/HaXVGzq0JKQRsjRDOiYObtcr nBY9c9poKTTpvB5MElSkhAZ16g7S6PKtTGMBqC+YygMVtl2aW6WslNWqr46GovM9Mg0I5YVQQkQd niRoDO4PqpAD5BegFzgJYWIwS3gQAwOBPYitqxY/8DaD0cNmoUDVjoWIqjHhIjCHowjYEMBi+QER r84N5pzxI6jFqENxBfvwVxAbcIGmJZUiflDSBUvBBlysgZGB6G66lnQDfZ2+8yBL9v/F3JFOFCQI +h8ZgA==