diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-08 13:17:28 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-03 17:53:57 +0100 |
commit | 36788e95fdbe96ac27c71197fdbfee178b53f52c (patch) | |
tree | 31c45984896a72ee3c1aaaeca2a5ba0d1ad06104 /avmedia | |
parent | fdo#61320: Allow user to choose whether to create thumbnails inside odf. (diff) | |
download | core-36788e95fdbe96ac27c71197fdbfee178b53f52c.tar.gz core-36788e95fdbe96ac27c71197fdbfee178b53f52c.zip |
upgrade liborcus
Conflicts:
external/boost/StaticLibrary_boost_system.mk
Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Diffstat (limited to 'avmedia')
-rw-r--r-- | avmedia/Library_avmediavlc.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk index b19eac9b1a0f..43be24e97863 100644 --- a/avmedia/Library_avmediavlc.mk +++ b/avmedia/Library_avmediavlc.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Library_use_sdk_api,avmediavlc)) $(eval $(call gb_Library_use_externals,avmediavlc,\ boost_headers \ - boostsystem \ + boost_system \ )) $(eval $(call gb_Library_use_libraries,avmediavlc,\ |