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