Merge remote branch 'origin/master' into leos-crash

Browse Source

Conflicts:
	src/sip/twitter/twitter.cpp
	src/sip/twitter/twitterconfigwidget.cpp

...

This commit is contained in:

Jeff Mitchell

2011-05-03 21:58:24 -04:00

parent bcfea87607 7d1067dafa

commit a81bca6ce1

63 changed files with 3297 additions and 611 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

thirdparty/jreen vendored

Submodule thirdparty/jreen updated: 8f995f2466...40fd6b0a3d