X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=5fd331e79720bb0e50d92efaa336cad01706f6d0;hb=8190e3631ba5f1734e5b45a7e0a0e5999ab70d26;hp=a15d180a8e2c5e4d8e1047537993d7ef4cb39cc1;hpb=e4db6fd0420a0917724a896d29f17666f8c80427;p=youtube-dl diff --git a/youtube-dl b/youtube-dl index a15d180a8..5fd331e79 100755 --- a/youtube-dl +++ b/youtube-dl @@ -2064,7 +2064,7 @@ if __name__ == '__main__': # Parse command line parser = optparse.OptionParser( usage='Usage: %prog [options] url...', - version='2010.07.14', + version='2010.07.22', conflict_handler='resolve', )