Fix merge conflict.
Fix merge conflict.

2005/02/24 23:28:02-08:00 hp.com!davidm
Fix merge-conflict.

2004/11/16 14:09:01-08:00 hp.com!davidm
Manual merge.

2004/11/05 00:14:10-08:00 hp.com!davidm
Fix merge conflict.

2004/11/03 13:57:00-08:00 hp.com!davidm
Merge.

2004/10/19 23:06:23-07:00 mostang.com!davidm
(pkg_minor): Switch to 99.
(pkg_extra): Switch to -alpha.
(CFLAGS): Add -fexceptions if we're compiling with GCC.  It's
	needed to get the proper unwind tables on platforms
	with DWARF unwind info (well, at least on x86 it's needed).

(Logical change 1.290)

DroidSim/platform_external_libunwind,adsharma/libunwind,0xlab/0xdroid-external_libunwind,geekboxzone/mmallow_external_libunwind,mpercy/libunwind,Chilledheart/libunwind,android-ia/platform_external_libunwind,olibc/libunwind,zliu2014/libunwind-tilegx,tony/libunwind,bo-on-software/libunwind,djwatson/libunwind,wdv4758h/libunwind,unkadoug/libunwind,cms-externals/libunwind,fdoray/libunwind,jrmuizel/libunwind,Chilledheart/libunwind,jrmuizel/libunwind,atanasyan/libunwind,android-ia/platform_external_libunwind,0xlab/0xdroid-external_libunwind,olibc/libunwind,ehsan/libunwind,jrmuizel/libunwind,tkelman/libunwind,vegard/libunwind,krytarowski/libunwind,androidarmv6/android_external_libunwind,krytarowski/libunwind,dagar/libunwind,cloudius-systems/libunwind,evaautomation/libunwind,DroidSim/platform_external_libunwind,zeldin/platform_external_libunwind,frida/libunwind,lat/libunwind,joyent/libunwind,vtjnash/libunwind,maltek/platform_external_libunwind,androidarmv6/android_external_libunwind,CyanogenMod/android_external_libunwind,wdv4758h/libunwind,Keno/libunwind,dropbox/libunwind,adsharma/libunwind,evaautomation/libunwind,frida/libunwind,pathscale/libunwind,project-zerus/libunwind,martyone/libunwind,zliu2014/libunwind-tilegx,SyndicateRogue/libunwind,yuyichao/libunwind,pathscale/libunwind,tony/libunwind,joyent/libunwind,zeldin/platform_external_libunwind,project-zerus/libunwind,rogwfu/libunwind,geekboxzone/mmallow_external_libunwind,martyone/libunwind,DroidSim/platform_external_libunwind,cloudius-systems/libunwind,maltek/platform_external_libunwind,igprof/libunwind,unkadoug/libunwind,evaautomation/libunwind,atanasyan/libunwind-android,CyanogenMod/android_external_libunwind,vtjnash/libunwind,atanasyan/libunwind,joyent/libunwind,geekboxzone/lollipop_external_libunwind,cms-externals/libunwind,rantala/libunwind,tronical/libunwind,cms-externals/libunwind,pathscale/libunwind,cloudius-systems/libunwind,lat/libunwind,yuyichao/libunwind,rogwfu/libunwind,frida/libunwind,fillexen/libunwind,atanasyan/libunwind-android,mpercy/libunwind,geekboxzone/mmallow_external_libunwind,mpercy/libunwind,bo-on-software/libunwind,unkadoug/libunwind,rantala/libunwind,tronical/libunwind,0xlab/0xdroid-external_libunwind,Keno/libunwind,dreal-deps/libunwind,fillexen/libunwind,tronical/libunwind,igprof/libunwind,libunwind/libunwind,lat/libunwind,tkelman/libunwind,atanasyan/libunwind-android,zliu2014/libunwind-tilegx,rogwfu/libunwind,vegard/libunwind,martyone/libunwind,Keno/libunwind,tony/libunwind,vtjnash/libunwind,krytarowski/libunwind,android-ia/platform_external_libunwind,tkelman/libunwind,rntz/libunwind,ehsan/libunwind,Chilledheart/libunwind,zeldin/platform_external_libunwind,geekboxzone/lollipop_external_libunwind,igprof/libunwind,bo-on-software/libunwind,olibc/libunwind,adsharma/libunwind,djwatson/libunwind,atanasyan/libunwind,rntz/libunwind,libunwind/libunwind,rntz/libunwind,fillexen/libunwind,dagar/libunwind,ehsan/libunwind,yuyichao/libunwind,dropbox/libunwind,dropbox/libunwind,wdv4758h/libunwind,dreal-deps/libunwind,fdoray/libunwind,geekboxzone/lollipop_external_libunwind,djwatson/libunwind,SyndicateRogue/libunwind,libunwind/libunwind,dagar/libunwind,SyndicateRogue/libunwind,rantala/libunwind,project-zerus/libunwind,CyanogenMod/android_external_libunwind,maltek/platform_external_libunwind,fdoray/libunwind,dreal-deps/libunwind,vegard/libunwind,androidarmv6/android_external_libunwind