Mercurial > pidgin
changeset 15386:9143191e021b
merge of '0884993343342bda1638f3903202437b13175ab3'
and '3cb374255625c72e20208aca27585f230b36e915'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Mon, 22 Jan 2007 15:39:42 +0000 |
| parents | 967da2628f89 (current diff) b2a8c5eca30a (diff) |
| children | 937193bf17c3 51e81ffcfddf |
| files | pidgin/pixmaps/Makefile.mingw pidgin/pixmaps/smileys/Makefile.am pidgin/pixmaps/smileys/Makefile.mingw pidgin/pixmaps/smileys/THEMES-HOWTO pidgin/pixmaps/smileys/default/Makefile.am pidgin/pixmaps/smileys/default/Makefile.mingw pidgin/pixmaps/smileys/default/angel.png pidgin/pixmaps/smileys/default/bigsmile.png pidgin/pixmaps/smileys/default/burp.png pidgin/pixmaps/smileys/default/cool.png pidgin/pixmaps/smileys/default/crazy.png pidgin/pixmaps/smileys/default/crossedlips.png pidgin/pixmaps/smileys/default/cry.png pidgin/pixmaps/smileys/default/download.png pidgin/pixmaps/smileys/default/embarrassed.png pidgin/pixmaps/smileys/default/farted.png pidgin/pixmaps/smileys/default/kiss.png pidgin/pixmaps/smileys/default/luke.png pidgin/pixmaps/smileys/default/moneymouth.png pidgin/pixmaps/smileys/default/mrt.png pidgin/pixmaps/smileys/default/msn_angel.png pidgin/pixmaps/smileys/default/msn_angry.png pidgin/pixmaps/smileys/default/msn_away.png pidgin/pixmaps/smileys/default/msn_bat.gif pidgin/pixmaps/smileys/default/msn_beer.png pidgin/pixmaps/smileys/default/msn_bowl.png pidgin/pixmaps/smileys/default/msn_boy.png pidgin/pixmaps/smileys/default/msn_brb.png pidgin/pixmaps/smileys/default/msn_brheart.png pidgin/pixmaps/smileys/default/msn_cake.gif pidgin/pixmaps/smileys/default/msn_car.png pidgin/pixmaps/smileys/default/msn_cat.png pidgin/pixmaps/smileys/default/msn_cellphone.png pidgin/pixmaps/smileys/default/msn_cigarette.gif pidgin/pixmaps/smileys/default/msn_clock.png pidgin/pixmaps/smileys/default/msn_coffee.png pidgin/pixmaps/smileys/default/msn_coins.png pidgin/pixmaps/smileys/default/msn_computer.png pidgin/pixmaps/smileys/default/msn_cry.gif pidgin/pixmaps/smileys/default/msn_deadflower.png pidgin/pixmaps/smileys/default/msn_devil.png pidgin/pixmaps/smileys/default/msn_dog.png pidgin/pixmaps/smileys/default/msn_dontknow.gif pidgin/pixmaps/smileys/default/msn_donttell.png pidgin/pixmaps/smileys/default/msn_drink.png pidgin/pixmaps/smileys/default/msn_email.png pidgin/pixmaps/smileys/default/msn_embarrassed.png pidgin/pixmaps/smileys/default/msn_eyeroll.gif pidgin/pixmaps/smileys/default/msn_film.png pidgin/pixmaps/smileys/default/msn_fingerscrossed.png pidgin/pixmaps/smileys/default/msn_flower.png pidgin/pixmaps/smileys/default/msn_gift.png pidgin/pixmaps/smileys/default/msn_girl.png pidgin/pixmaps/smileys/default/msn_handcuffs.png pidgin/pixmaps/smileys/default/msn_heart.png pidgin/pixmaps/smileys/default/msn_highfive.png pidgin/pixmaps/smileys/default/msn_hot.png pidgin/pixmaps/smileys/default/msn_icon.png pidgin/pixmaps/smileys/default/msn_idea.png pidgin/pixmaps/smileys/default/msn_island.png pidgin/pixmaps/smileys/default/msn_kiss.png pidgin/pixmaps/smileys/default/msn_laugh.png pidgin/pixmaps/smileys/default/msn_lightning.gif pidgin/pixmaps/smileys/default/msn_nerd.png pidgin/pixmaps/smileys/default/msn_neutral.png pidgin/pixmaps/smileys/default/msn_note.png pidgin/pixmaps/smileys/default/msn_occ.png pidgin/pixmaps/smileys/default/msn_online.png pidgin/pixmaps/smileys/default/msn_ooooh.png pidgin/pixmaps/smileys/default/msn_party.gif pidgin/pixmaps/smileys/default/msn_phone.png pidgin/pixmaps/smileys/default/msn_photo.png pidgin/pixmaps/smileys/default/msn_pizza.png pidgin/pixmaps/smileys/default/msn_plane.png pidgin/pixmaps/smileys/default/msn_plate.png pidgin/pixmaps/smileys/default/msn_question.png pidgin/pixmaps/smileys/default/msn_rainbow.png pidgin/pixmaps/smileys/default/msn_run.png pidgin/pixmaps/smileys/default/msn_runback.png pidgin/pixmaps/smileys/default/msn_sad.png pidgin/pixmaps/smileys/default/msn_sarcastic.png pidgin/pixmaps/smileys/default/msn_secret.png pidgin/pixmaps/smileys/default/msn_sheep.png pidgin/pixmaps/smileys/default/msn_sick.png pidgin/pixmaps/smileys/default/msn_sleep.png pidgin/pixmaps/smileys/default/msn_sleepy.gif pidgin/pixmaps/smileys/default/msn_smiley.png pidgin/pixmaps/smileys/default/msn_snail.png pidgin/pixmaps/smileys/default/msn_soccer.png pidgin/pixmaps/smileys/default/msn_star.png pidgin/pixmaps/smileys/default/msn_stormy.png pidgin/pixmaps/smileys/default/msn_sun.png pidgin/pixmaps/smileys/default/msn_sunglasses.png pidgin/pixmaps/smileys/default/msn_teeth.png pidgin/pixmaps/smileys/default/msn_think.gif pidgin/pixmaps/smileys/default/msn_thumbdown.png pidgin/pixmaps/smileys/default/msn_thumbup.png pidgin/pixmaps/smileys/default/msn_tongue.png pidgin/pixmaps/smileys/default/msn_turtle.png pidgin/pixmaps/smileys/default/msn_umbrella.png pidgin/pixmaps/smileys/default/msn_weird.png pidgin/pixmaps/smileys/default/msn_wink.gif pidgin/pixmaps/smileys/default/msn_xbox.png pidgin/pixmaps/smileys/default/oneeye.png pidgin/pixmaps/smileys/default/qq_smiley_0.gif pidgin/pixmaps/smileys/default/qq_smiley_1.gif pidgin/pixmaps/smileys/default/qq_smiley_10.gif pidgin/pixmaps/smileys/default/qq_smiley_11.gif pidgin/pixmaps/smileys/default/qq_smiley_12.gif pidgin/pixmaps/smileys/default/qq_smiley_13.gif pidgin/pixmaps/smileys/default/qq_smiley_14.gif pidgin/pixmaps/smileys/default/qq_smiley_15.gif pidgin/pixmaps/smileys/default/qq_smiley_16.gif pidgin/pixmaps/smileys/default/qq_smiley_17.gif pidgin/pixmaps/smileys/default/qq_smiley_18.gif pidgin/pixmaps/smileys/default/qq_smiley_19.gif pidgin/pixmaps/smileys/default/qq_smiley_2.gif pidgin/pixmaps/smileys/default/qq_smiley_20.gif pidgin/pixmaps/smileys/default/qq_smiley_21.gif pidgin/pixmaps/smileys/default/qq_smiley_22.gif pidgin/pixmaps/smileys/default/qq_smiley_23.gif pidgin/pixmaps/smileys/default/qq_smiley_24.gif pidgin/pixmaps/smileys/default/qq_smiley_25.gif pidgin/pixmaps/smileys/default/qq_smiley_26.gif pidgin/pixmaps/smileys/default/qq_smiley_27.gif pidgin/pixmaps/smileys/default/qq_smiley_28.gif pidgin/pixmaps/smileys/default/qq_smiley_29.gif pidgin/pixmaps/smileys/default/qq_smiley_3.gif pidgin/pixmaps/smileys/default/qq_smiley_30.gif pidgin/pixmaps/smileys/default/qq_smiley_31.gif pidgin/pixmaps/smileys/default/qq_smiley_32.gif pidgin/pixmaps/smileys/default/qq_smiley_33.gif pidgin/pixmaps/smileys/default/qq_smiley_34.gif pidgin/pixmaps/smileys/default/qq_smiley_35.gif pidgin/pixmaps/smileys/default/qq_smiley_36.gif pidgin/pixmaps/smileys/default/qq_smiley_37.gif pidgin/pixmaps/smileys/default/qq_smiley_38.gif pidgin/pixmaps/smileys/default/qq_smiley_39.gif pidgin/pixmaps/smileys/default/qq_smiley_4.gif pidgin/pixmaps/smileys/default/qq_smiley_40.gif pidgin/pixmaps/smileys/default/qq_smiley_41.gif pidgin/pixmaps/smileys/default/qq_smiley_42.gif pidgin/pixmaps/smileys/default/qq_smiley_43.gif pidgin/pixmaps/smileys/default/qq_smiley_44.gif pidgin/pixmaps/smileys/default/qq_smiley_45.gif pidgin/pixmaps/smileys/default/qq_smiley_46.gif pidgin/pixmaps/smileys/default/qq_smiley_47.gif pidgin/pixmaps/smileys/default/qq_smiley_48.gif pidgin/pixmaps/smileys/default/qq_smiley_49.gif pidgin/pixmaps/smileys/default/qq_smiley_5.gif pidgin/pixmaps/smileys/default/qq_smiley_50.gif pidgin/pixmaps/smileys/default/qq_smiley_51.gif pidgin/pixmaps/smileys/default/qq_smiley_52.gif pidgin/pixmaps/smileys/default/qq_smiley_53.gif pidgin/pixmaps/smileys/default/qq_smiley_54.gif pidgin/pixmaps/smileys/default/qq_smiley_55.gif pidgin/pixmaps/smileys/default/qq_smiley_56.gif pidgin/pixmaps/smileys/default/qq_smiley_57.gif pidgin/pixmaps/smileys/default/qq_smiley_58.gif pidgin/pixmaps/smileys/default/qq_smiley_59.gif pidgin/pixmaps/smileys/default/qq_smiley_6.gif pidgin/pixmaps/smileys/default/qq_smiley_60.gif pidgin/pixmaps/smileys/default/qq_smiley_61.gif pidgin/pixmaps/smileys/default/qq_smiley_62.gif pidgin/pixmaps/smileys/default/qq_smiley_63.gif pidgin/pixmaps/smileys/default/qq_smiley_64.gif pidgin/pixmaps/smileys/default/qq_smiley_65.gif pidgin/pixmaps/smileys/default/qq_smiley_66.gif pidgin/pixmaps/smileys/default/qq_smiley_67.gif pidgin/pixmaps/smileys/default/qq_smiley_68.gif pidgin/pixmaps/smileys/default/qq_smiley_69.gif pidgin/pixmaps/smileys/default/qq_smiley_7.gif pidgin/pixmaps/smileys/default/qq_smiley_70.gif pidgin/pixmaps/smileys/default/qq_smiley_71.gif pidgin/pixmaps/smileys/default/qq_smiley_72.gif pidgin/pixmaps/smileys/default/qq_smiley_73.gif pidgin/pixmaps/smileys/default/qq_smiley_74.gif pidgin/pixmaps/smileys/default/qq_smiley_75.gif pidgin/pixmaps/smileys/default/qq_smiley_76.gif pidgin/pixmaps/smileys/default/qq_smiley_77.gif pidgin/pixmaps/smileys/default/qq_smiley_78.gif pidgin/pixmaps/smileys/default/qq_smiley_79.gif pidgin/pixmaps/smileys/default/qq_smiley_8.gif pidgin/pixmaps/smileys/default/qq_smiley_80.gif pidgin/pixmaps/smileys/default/qq_smiley_81.gif pidgin/pixmaps/smileys/default/qq_smiley_82.gif pidgin/pixmaps/smileys/default/qq_smiley_83.gif pidgin/pixmaps/smileys/default/qq_smiley_84.gif pidgin/pixmaps/smileys/default/qq_smiley_85.gif pidgin/pixmaps/smileys/default/qq_smiley_86.gif pidgin/pixmaps/smileys/default/qq_smiley_87.gif pidgin/pixmaps/smileys/default/qq_smiley_88.gif pidgin/pixmaps/smileys/default/qq_smiley_89.gif pidgin/pixmaps/smileys/default/qq_smiley_9.gif pidgin/pixmaps/smileys/default/qq_smiley_90.gif pidgin/pixmaps/smileys/default/qq_smiley_91.gif pidgin/pixmaps/smileys/default/qq_smiley_92.gif pidgin/pixmaps/smileys/default/qq_smiley_93.gif pidgin/pixmaps/smileys/default/qq_smiley_94.gif pidgin/pixmaps/smileys/default/qq_smiley_95.gif pidgin/pixmaps/smileys/default/sad.png pidgin/pixmaps/smileys/default/scream.png pidgin/pixmaps/smileys/default/smile.png pidgin/pixmaps/smileys/default/theme pidgin/pixmaps/smileys/default/think.png pidgin/pixmaps/smileys/default/tongue.png pidgin/pixmaps/smileys/default/wink.png pidgin/pixmaps/smileys/default/yahoo_alien.gif pidgin/pixmaps/smileys/default/yahoo_alien2.gif pidgin/pixmaps/smileys/default/yahoo_angel.gif pidgin/pixmaps/smileys/default/yahoo_angry.gif pidgin/pixmaps/smileys/default/yahoo_batting.gif pidgin/pixmaps/smileys/default/yahoo_beatup.gif pidgin/pixmaps/smileys/default/yahoo_bigsmile.gif pidgin/pixmaps/smileys/default/yahoo_blush.gif pidgin/pixmaps/smileys/default/yahoo_brokenheart.gif pidgin/pixmaps/smileys/default/yahoo_bye.gif pidgin/pixmaps/smileys/default/yahoo_chicken.gif pidgin/pixmaps/smileys/default/yahoo_clap.gif pidgin/pixmaps/smileys/default/yahoo_clown.gif pidgin/pixmaps/smileys/default/yahoo_coffee.gif pidgin/pixmaps/smileys/default/yahoo_cow.gif pidgin/pixmaps/smileys/default/yahoo_cowboy.gif pidgin/pixmaps/smileys/default/yahoo_cry.gif pidgin/pixmaps/smileys/default/yahoo_dance.gif pidgin/pixmaps/smileys/default/yahoo_devil.gif pidgin/pixmaps/smileys/default/yahoo_doh.gif pidgin/pixmaps/smileys/default/yahoo_drool.gif pidgin/pixmaps/smileys/default/yahoo_eyebrow.gif pidgin/pixmaps/smileys/default/yahoo_eyeroll.gif pidgin/pixmaps/smileys/default/yahoo_femalefighter.gif pidgin/pixmaps/smileys/default/yahoo_flag.gif pidgin/pixmaps/smileys/default/yahoo_flower.gif pidgin/pixmaps/smileys/default/yahoo_frustrated.gif pidgin/pixmaps/smileys/default/yahoo_ghost.gif pidgin/pixmaps/smileys/default/yahoo_giggle.gif pidgin/pixmaps/smileys/default/yahoo_glasses.gif pidgin/pixmaps/smileys/default/yahoo_huggs.gif pidgin/pixmaps/smileys/default/yahoo_hypnotized.gif pidgin/pixmaps/smileys/default/yahoo_idea.gif pidgin/pixmaps/smileys/default/yahoo_kiss.gif pidgin/pixmaps/smileys/default/yahoo_laughloud.gif pidgin/pixmaps/smileys/default/yahoo_liar.gif pidgin/pixmaps/smileys/default/yahoo_loser.gif pidgin/pixmaps/smileys/default/yahoo_love.gif pidgin/pixmaps/smileys/default/yahoo_madtongue.gif pidgin/pixmaps/smileys/default/yahoo_malefighter1.gif pidgin/pixmaps/smileys/default/yahoo_malefighter2.gif pidgin/pixmaps/smileys/default/yahoo_mean.gif pidgin/pixmaps/smileys/default/yahoo_moneyeyes.gif pidgin/pixmaps/smileys/default/yahoo_monkey.gif pidgin/pixmaps/smileys/default/yahoo_nailbiting.gif pidgin/pixmaps/smileys/default/yahoo_neutral.gif pidgin/pixmaps/smileys/default/yahoo_ooooh.gif pidgin/pixmaps/smileys/default/yahoo_party.gif pidgin/pixmaps/smileys/default/yahoo_peace.gif pidgin/pixmaps/smileys/default/yahoo_pig.gif pidgin/pixmaps/smileys/default/yahoo_pray.gif pidgin/pixmaps/smileys/default/yahoo_pumpkin.gif pidgin/pixmaps/smileys/default/yahoo_question.gif pidgin/pixmaps/smileys/default/yahoo_rotfl.gif pidgin/pixmaps/smileys/default/yahoo_sad.gif pidgin/pixmaps/smileys/default/yahoo_shame.gif pidgin/pixmaps/smileys/default/yahoo_shamrock.gif pidgin/pixmaps/smileys/default/yahoo_shhhh.gif pidgin/pixmaps/smileys/default/yahoo_sick.gif pidgin/pixmaps/smileys/default/yahoo_sighing.gif pidgin/pixmaps/smileys/default/yahoo_silent.gif pidgin/pixmaps/smileys/default/yahoo_silly.gif pidgin/pixmaps/smileys/default/yahoo_sleep.gif pidgin/pixmaps/smileys/default/yahoo_smiley.gif pidgin/pixmaps/smileys/default/yahoo_star.gif pidgin/pixmaps/smileys/default/yahoo_sunglas.gif pidgin/pixmaps/smileys/default/yahoo_sweating.gif pidgin/pixmaps/smileys/default/yahoo_talktohand.gif pidgin/pixmaps/smileys/default/yahoo_think.gif pidgin/pixmaps/smileys/default/yahoo_tired.gif pidgin/pixmaps/smileys/default/yahoo_tongue.gif pidgin/pixmaps/smileys/default/yahoo_waiting.gif pidgin/pixmaps/smileys/default/yahoo_waving.gif pidgin/pixmaps/smileys/default/yahoo_whistling.gif pidgin/pixmaps/smileys/default/yahoo_wink.gif pidgin/pixmaps/smileys/default/yahoo_worried.gif pidgin/pixmaps/smileys/default/yahoo_worship.gif pidgin/pixmaps/smileys/default/yahoo_yingyang.gif pidgin/pixmaps/smileys/default/yahoo_youkiddingme.gif pidgin/pixmaps/smileys/default/yell.png pidgin/pixmaps/smileys/none/Makefile.am pidgin/pixmaps/smileys/none/Makefile.mingw pidgin/pixmaps/smileys/none/theme |
| diffstat | 1 files changed, 49 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.mtn-ignore Mon Jan 22 15:39:42 2007 +0000 @@ -0,0 +1,49 @@ +.*/?Makefile(\.in)? +(.*/)?TAGS$ +.*/?.*\.pc$ +.*/perl/common/[^/]+\.c$ +.*/perl/common/blib.* +.*/perl/common/pm_to_blib$ +.*\.bs$ +intltool-.* +Doxyfile +aclocal.m4 +compile +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +console/gaim-text +console/libgnt/gntmarshal.c +console/libgnt/gntmarshal.h +depcomp +doc/gaim-text.1 +doc/gaim.1 +gaim.apspec +gaim.desktop +gaim.service +gaim.spec +pidgin/gaim +pidgin/plugins/musicmessaging/music-messaging-bindings.c +pidgin/plugins/perl/common/Makefile.PL +install-sh +libpurple/dbus-bindings.c +libpurple/dbus-types.c +libpurple/dbus-types.h +libpurple/gaim-client-bindings.c +libpurple/gaim-client-bindings.h +libpurple/gaim-client-example +libpurple/gconf/gaim.schemas +libpurple/plugins/dbus-example-bindings.c +libpurple/plugins/perl/common/const-c.inc +libpurple/plugins/perl/common/const-xs.inc +libtool +ltmain.sh +missing +mkinstalldirs +po/POTFILES +po/stamp-it +stamp-h1