[Swfdec] [Swfdec-commits] 14 commits - configure.ac swfdec/.gitignore swfdec-gtk/swfdec_gtk_loader.c swfdec-gtk/swfdec_playback_alsa.c swfdec/Makefile.am swfdec/swfdec_asnative.h swfdec/swfdec_as_string.c swfdec/swfdec_audio.c swfdec/swfdec_audio_load.c swfdec/swfdec_audio_load.h swfdec/swfdec_audio_stream.c swfdec/swfdec_audio_stream.h swfdec/swfdec_audio_swf_stream.c swfdec/swfdec.h swfdec/swfdec_loader.h swfdec/swfdec_load_sound.c swfdec/swfdec_load_sound.h swfdec/swfdec_net_stream_as.c swfdec/swfdec_net_stream.c swfdec/swfdec_net_stream.h swfdec/swfdec_player_as.c swfdec/swfdec_player_internal.h swfdec/swfdec_policy_file.c swfdec/swfdec_policy_file.h swfdec/swfdec_sandbox.h swfdec/swfdec_sound_object.c swfdec/swfdec_sound_object.h swfdec/swfdec_types.h test/trace vivified/code

[Riccardo Magliocchetti]

Benjamin Otte wrote:
>  swfdec/swfdec_asnative.h                         |   32 ++

I got this pulling:

rm at eurasia:~/swfdec/swfdec$ git pull
error: Untracked working tree file 'swfdec/swfdec_asnative.h' would be 
overwritten by merge.
fatal: merging of trees 3df79563f8172d67281cd8ab5785436cb53b871c and 
dc317980314e0b7dcd52f4cf77e1a17d93c91776 failed
Merge with strategy recursive failed.

Removing the file fixed the issue for me.
Then that file should be removed from .gitignore right? Patch attached.

cheers,
rm

-------------- next part --------------
A non-text attachment was scrubbed...
Name: remove-from-gitignore-asnative.h
Type: text/x-chdr
Size: 250 bytes
Desc: not available
Url : http://lists.freedesktop.org/archives/swfdec/attachments/20080615/ce63492f/attachment.h