Merge lp:~sergiusens/ubuntu-seeds/touch_base into lp:~ubuntu-core-dev/ubuntu-seeds/ubuntu-touch.saucy

[Sergio Schvezov]

[Loïc Minier (lool)]

Looks good; would be good to add comments to easily tell what e.g. libqtubuntu-media-signals1 does

review: Approve

[lp:~sergiusens/ubuntu-seeds/touch_base]

112. By Sergio Schvezov on 2013-10-07

Adding comments

=== modified file 'sdk-libs'
--- sdk-libs	2013-10-01 01:06:28 +0000
+++ sdk-libs	2013-10-07 17:16:13 +0000
@@ -26,6 +26,7 @@
  * qtdeclarative5-xmllistmodel-plugin
  * qtdeclarative5-qtlocation-plugin
  * qtdeclarative5-poppler-qml-plugin
+ * qtdeclarative5-usermetrics0.1
 
 = Ubuntu UI Toolkit =
 

=== modified file 'touch'
--- touch	2013-10-04 18:06:05 +0000
+++ touch	2013-10-07 17:16:13 +0000
@@ -62,6 +62,14 @@
  * account-plugin-ubuntuone
  * account-plugin-google
  * click-update-manager
+# A QtMultimedia camera plugin that talks to Android by using hybris
+ * cameraplugin-aal
+# Plugin for showing camera viewfinder in Qt as well as the video surface in 
+# the media-player
+ * qtvideonode-plugin
+# Library that coordinates qtvideo-node, qtubuntu-camera and qtubuntu-media
+# across thread contexts.
+ * libqtubuntu-media-signals1
 
 == Multimedia ==