Public Git Hosting - siplcs.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: c5af093 4c2e361)

commit	1b76eba58a97325ac1cc3c1ce257155ebe02d195
author	Stefan Becker <chemobejk@gmail.com>
	Sat, 23 Mar 2013 18:55:04 +0000 (23 20:55 +0200)
committer	Stefan Becker <chemobejk@gmail.com>
	Sat, 23 Mar 2013 18:55:04 +0000 (23 20:55 +0200)
tree	b7560ba4dce68437e2944bceb6c6fd34d0fac840	tree \| snapshot (tar.gz zip)
parent	c5af0930c1a58d85dd37eaf1093fe45b33ac873b	commit \| diff
parent	4c2e3615f1acc2e4087c39a245b12ff4f695b554	commit \| diff

Merge branch 'mob' into topic-http-rewrite

Conflicts:
src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj
src/core/Makefile.mingw
src/core/sipe-core-private.h
src/core/sipe-core.c

siplcs.vcxproj	diff1 \|	diff2 \|	blob \| history
src/core/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/core/Makefile.mingw	diff1 \|	diff2 \|	blob \| history
src/core/sipe-core-private.h	diff1 \|	diff2 \|	blob \| history
src/core/sipe-core.c	diff1 \|	diff2 \|	blob \| history

A third-party Pidgin plugin for Microsoft LCS/OCS