Mercurial > pidgin
annotate libpurple/protocols/Makefile.am @ 30524:6d69151fa99b
Merge fix.
There is still a change lost that should be re-introduced in libpurple/media
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 18 Feb 2010 22:20:06 +0000 |
parents | 69aa4660401a |
children | 09f469cb19a8 |
rev | line source |
---|---|
17439
6fefda6a7d57
null does not need to be in EXTRA_DIST because it is in DIST_SUBDIRS
Stu Tomlinson <stu@nosnilmot.com>
parents:
17373
diff
changeset
|
1 EXTRA_DIST = Makefile.mingw |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
2 |
28526
69aa4660401a
Initial addition of the MXit protocol plugin, provided by the MXit folks
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
26234
diff
changeset
|
3 DIST_SUBDIRS = bonjour gg irc jabber msn msnp9 myspace mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr |
15373
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
4 |
5fe8042783c1
Rename gtk/ and libgaim/ to pidgin/ and libpurple/
Sean Egan <seanegan@gmail.com>
parents:
diff
changeset
|
5 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS) |