Mercurial > pidgin.yaz
comparison libpurple/mime.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 | 44b4e8bd759b |
| children | 13d8b6c6ae42 0c796a1950b7 |
comparison
equal
deleted
inserted
replaced
| 19695:301f1597d41f | 19696:481749fc0b6b |
|---|---|
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 16 * General Public License for more details. | 16 * 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, | 20 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, |
| 21 * USA. | 21 * USA. |
| 22 */ | 22 */ |
| 23 | 23 |
| 24 #include <stdio.h> | 24 #include <stdio.h> |
| 25 #include <string.h> | 25 #include <string.h> |