Mercurial > pidgin.yaz
comparison libpurple/account.c @ 19696:481749fc0b6b
merge of '1c7910841138381c841363256ca3c7905b1f26b0'
and '5818cbd5fe95d6a167f1555b882526f36790b141'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 10 Sep 2007 13:57:15 +0000 |
parents | 1d2002a5735e 44b4e8bd759b |
children | 6a0d9fa477d4 6bf32c9e15a7 454b2b7b333e |
comparison
equal
deleted
inserted
replaced
19695:301f1597d41f | 19696:481749fc0b6b |
---|---|
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
19 * GNU General Public License for more details. | 19 * GNU General Public License for more details. |
20 * | 20 * |
21 * You should have received a copy of the GNU General Public License | 21 * You should have received a copy of the GNU General Public License |
22 * along with this program; if not, write to the Free Software | 22 * along with this program; if not, write to the Free Software |
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
24 */ | 24 */ |
25 #include "internal.h" | 25 #include "internal.h" |
26 #include "account.h" | 26 #include "account.h" |
27 #include "core.h" | 27 #include "core.h" |
28 #include "dbus-maybe.h" | 28 #include "dbus-maybe.h" |