summaryrefslogtreecommitdiff
path: root/src/gui/serverdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-16 00:34:21 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-16 00:34:21 +0300
commit6bbe09af6faa77df40112e7cf876877ef11ce74b (patch)
treede5ed5f00b34daa9c6cc268fdaacead00b7e7e85 /src/gui/serverdialog.cpp
parentc3434fa53d1c83bc65b640951364f842fe6c79f4 (diff)
parent2ed0917b4ee942ff55639500f846ae9cb4f48b90 (diff)
downloadplus-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.gz
plus-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.bz2
plus-6bbe09af6faa77df40112e7cf876877ef11ce74b.tar.xz
plus-6bbe09af6faa77df40112e7cf876877ef11ce74b.zip
Merge branch 'androidtemp'
Conflicts: configure.ac
Diffstat (limited to 'src/gui/serverdialog.cpp')
0 files changed, 0 insertions, 0 deletions