Yann Leboulanger 3bc22371cc [ruiabreuferreira and I] ability to use http_proxy environment variable. fixes #2977		2007-12-19 14:42:04 +00:00
..
emoticons	merge diff from trunk	2007-12-12 08:44:46 +00:00
glade	[ruiabreuferreira and I] ability to use http_proxy environment variable. fixes #2977	2007-12-19 14:42:04 +00:00
iconsets	merge diff from trunk to pep branch	2007-08-09 15:39:18 +00:00
nibs/Gajim.nib	merge diff from trunk	2007-12-12 08:44:46 +00:00
other	merge diff from trunk	2007-12-12 08:44:46 +00:00
pixmaps	merge diff from trunk	2007-12-12 08:44:46 +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	merge diff from trunk	2007-12-12 08:44:46 +00:00
defs.py.in	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
gajim-remote.1	merge diff from trunk	2007-12-12 08:44:46 +00:00
gajim.1	Commit changes missing in last merge.	2006-11-18 21:10:52 +00:00
gajim.desktop.in.in	merge diff from trunk	2007-12-12 08:44:46 +00:00