Mercurial > pidgin
comparison libpurple/protocols/msn/servconn.c @ 20514:723b5a2f91ce
explicit merge of 'd565bd9a8e62d3302ac14bb7c3a68a52c0c6a65e'
and '791472752b3aab532e7fd551baa49e6e74a4cfe7'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 16 Sep 2007 18:03:53 +0000 |
| parents | 1754155051a4 44b4e8bd759b |
| children | 8a4748cbf844 |
comparison
equal
deleted
inserted
replaced
| 20513:8b8effa59cc6 | 20514:723b5a2f91ce |
|---|---|
| 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 18 * GNU General Public License for more details. | 18 * GNU General Public License for more details. |
| 19 * | 19 * |
| 20 * You should have received a copy of the GNU General Public License | 20 * You should have received a copy of the GNU General Public License |
| 21 * along with this program; if not, write to the Free Software | 21 * along with this program; if not, write to the Free Software |
| 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 23 */ | 23 */ |
| 24 #include "msn.h" | 24 #include "msn.h" |
| 25 #include "servconn.h" | 25 #include "servconn.h" |
| 26 #include "error.h" | 26 #include "error.h" |
| 27 | 27 |