mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-24 13:00:36 +00:00
Merge branch 'master' into 0.11
This commit is contained in:
commit
b304fff551
2 changed files with 2 additions and 2 deletions
|
@ -99,7 +99,7 @@ tool_run "$libtoolize" "--copy --force"
|
|||
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
|
||||
tool_run "$autoheader"
|
||||
|
||||
# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
|
||||
# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode
|
||||
echo timestamp > stamp-h.in 2> /dev/null
|
||||
|
||||
tool_run "$autoconf"
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit 6aec6b9716c184c60c4bc6a5916a2471cfa8c8cd
|
||||
Subproject commit 1ccbe098d6379612fcef09f4000da23585af980a
|
Loading…
Reference in a new issue