Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / docs / Makefile.am

diff --git a/docs/Makefile.am b/docs/Makefile.am
index baeaceb..10847b5 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -9,7 +9,6 @@ DIST_SUBDIRS = plugins
 
 EXTRA_DIST = \
         random/ChangeLog-0.8 \
-       upload.mak \
         version.entities.in
 
 upload: