← Back to branch summary

~neon/konversation/trunk

~neon/konversation/trunk

Viewing all changes in revision 7618.

Committer: Anselmo L. S. Melo
Date: 2015-10-18 13:15:41 UTC
mfrom: (7531.1.100)
Revision ID: git-v1:52bb049004859d09202f5a31a00f7b9244d36082

Merge branch '1.6'

files modified:
data/images/nickicons/default/index.desktop

src/application.cpp

src/dcc/dcccommon.cpp

src/irc/server.cpp

src/irc/serverdialogui.ui

src/irc/servergroupdialog.cpp

src/irc/serversettings.cpp

src/irc/serversettings.h

Show diffs side-by-side

added added

removed removed

data/images/nickicons/default/index.desktop

src/application.cpp

src/dcc/dcccommon.cpp

src/irc/server.cpp

src/irc/serverdialogui.ui

src/irc/servergroupdialog.cpp

src/irc/serversettings.cpp

src/irc/serversettings.h

Older »