Mercurial > pidgin.yaz
comparison libpurple/media.c @ 28400:f0eaa57f58c3
merge of 'a3cbe3e11bc3bb7a4c1ecd17011d62ffba9abedf'
and 'e44e56cf5f6cafb3f5e13b861940a3aa66cb7893'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 22 Aug 2009 02:59:15 +0000 |
| parents | 98d8c11e4937 8c991e09efcb |
| children | afa79877d972 |
comparison
equal
deleted
inserted
replaced
| 28395:98d8c11e4937 | 28400:f0eaa57f58c3 |
|---|---|
| 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 20 * GNU General Public License for more details. | 20 * GNU General Public License for more details. |
| 21 * | 21 * |
| 22 * You should have received a copy of the GNU General Public License | 22 * You should have received a copy of the GNU General Public License |
| 23 * along with this program; if not, write to the Free Software | 23 * along with this program; if not, write to the Free Software |
| 24 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include <string.h> | 27 #include <string.h> |
| 28 | 28 |
| 29 #include "internal.h" | 29 #include "internal.h" |