<div dir="ltr">Looks like Edward Wang did the same thing and is commit made it to the tree so no point on me rebasing and committing again.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Sep 2, 2013 at 7:09 PM, Jean-Baptiste Kempf <span dir="ltr"><<a href="mailto:jb@videolan.org" target="_blank">jb@videolan.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Le 01/09/2013 00:58, Pedro Veloso a écrit :<div><div class="h5"><br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
  vlc-android/AndroidManifest.<u></u>xml | 6 ------<br>
  1 file changed, 6 deletions(-)<br>
<br>
diff --git a/vlc-android/AndroidManifest.<u></u>xml b/vlc-android/AndroidManifest.<u></u>xml<br>
index b2d500b..261f31b 100644<br>
--- a/vlc-android/AndroidManifest.<u></u>xml<br>
+++ b/vlc-android/AndroidManifest.<u></u>xml<br>
@@ -61,8 +61,6 @@<br>
          <activity<br>
              android:name=".gui.<u></u>DebugLogActivity" /><br>
          <activity<br>
-            android:name=".gui.video.<u></u>VideoGridFragment" /><br>
-        <activity<br>
              android:name=".gui.video.<u></u>MediaInfoActivity" /><br>
          <activity<br>
              android:name=".gui.video.<u></u>VideoPlayerActivity"<br>
@@ -369,10 +367,6 @@<br>
              </intent-filter><br>
          </activity><br>
          <activity<br>
-            android:name=".gui.audio.<u></u>AudioBrowserFragment" /><br>
-        <activity<br>
-            android:name=".gui.audio.<u></u>AudioListFragment" /><br>
-        <activity<br>
              android:name=".gui.audio.<u></u>AudioPlayerActivity"<br>
              android:theme="@android:style/<u></u>Theme.NoTitleBar"<br>
              android:launchMode="singleTop" /><br>
<br>
</blockquote>
<br>
<br></div></div>
Patch does not apply. Please rebase to the top of the tree.<span class="HOEnZb"><font color="#888888"><br>
<br>
-- <br>
Jean-Baptiste Kempf<br>
<a href="http://www.jbkempf.com/" target="_blank">http://www.jbkempf.com/</a> - +33 672 704 734<br>
Sent from my Electronic Device<br>
</font></span></blockquote></div><br></div>