merging upstream stedolan changes

This commit is contained in:
Lee Thompson committed 2013-02-02 20:39:23 -06:00
commit c7725a8d4d
40 files changed
+2426 -951

No files matched your search

+4 -4
View File
@@ -1,10 +1,10 @@
*.o
*~
# Test binaries
jv_test
jv_parse
parsertest*~
jq_test
build
jq
jq.1
# Something delightfully recursive happens otherwise
docs/content/2.download/source/*