Jean-Marie Traissard 31c3deb86e Merge back [7466], [7467] and [7472] that were overwritten by ad_hoc merge. Fixes ... #2200.		2006-11-19 19:45:43 +00:00
..
emoticons	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
glade	Merge back [7466], [7467] and [7472] that were overwritten by ad_hoc merge. Fixes	2006-11-19 19:45:43 +00:00
iconsets	remove no longer used ICO files	2006-11-18 23:15:43 +00:00
other	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
pixmaps	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
sounds	add sound for buddy bounce [future feature]. this snd is borrowed from GnomeBaker burnok sound	2006-03-12 21:20:08 +00:00
Makefile.am	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
defs.py.in	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
gajim-remote.1	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
gajim.1	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
gajim.desktop.in.in	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00