Merge branch 'master' of git://git.openpandora.org/openpandora.oe
authorDavid-John Willis <John.Willis@Distant-earth.com>
Wed, 29 Sep 2010 12:07:54 +0000 (13:07 +0100)
committerDavid-John Willis <John.Willis@Distant-earth.com>
Wed, 29 Sep 2010 12:07:54 +0000 (13:07 +0100)
Conflicts:
recipes/tasks/task-pandora-core.bb

recipes/tasks/task-pandora-core.bb

index da2482b..f24a7b1 100755 (executable)
@@ -48,7 +48,7 @@ MEDIA_LIBS = " \
   faad2 \
   mikmod \
   speex \  
-  flac \ 
+  flac \
   audiofile \
 "
 OPENGLES = " \
@@ -99,6 +99,9 @@ EXTRA_TOOLS = " \
   file \
   socat \
   strace \
+  screen \
+  rsync \
+  unrar \
   ksymoops \
   kexec-tools \
   zip \