Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/presence.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 | b0733d5d7621 44b4e8bd759b |
| children | 680a3aea5eb6 |
comparison
equal
deleted
inserted
replaced
| 19695:301f1597d41f | 19696:481749fc0b6b |
|---|---|
| 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 * GNU General Public License for more details. | 14 * GNU General Public License for more details. |
| 15 * | 15 * |
| 16 * You should have received a copy of the GNU General Public License | 16 * You should have received a copy of the GNU General Public License |
| 17 * along with this program; if not, write to the Free Software | 17 * along with this program; if not, write to the Free Software |
| 18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 19 * | 19 * |
| 20 */ | 20 */ |
| 21 #include "internal.h" | 21 #include "internal.h" |
| 22 | 22 |
| 23 #include "account.h" | 23 #include "account.h" |