Mercurial > pidgin
comparison libpurple/mime.h @ 20514:723b5a2f91ce
explicit merge of 'd565bd9a8e62d3302ac14bb7c3a68a52c0c6a65e'
and '791472752b3aab532e7fd551baa49e6e74a4cfe7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 16 Sep 2007 18:03:53 +0000 |
| parents | 44b4e8bd759b |
| children | 0c796a1950b7 |
comparison
equal
deleted
inserted
replaced
| 20513:8b8effa59cc6 | 20514:723b5a2f91ce |
|---|---|
| 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 #ifndef _PURPLE_MIME_H | 24 #ifndef _PURPLE_MIME_H |
| 25 #define _PURPLE_MIME_H | 25 #define _PURPLE_MIME_H |