~neon/knavalbattle/master

« back to all changes in this revision

Viewing changes to src/knavalbattle.kcfg

Committer: Roney Gomes
Date: 2013-07-22 03:09:59 UTC
mfrom: (1074.1.4)
Revision ID: git-v1:760506de583fc72bb6cadc66f631876903193643

Solved merge conflicts in .desktop file.

files added:
data/pictures/hi128-app-knavalbattle.png

data/pictures/hi16-app-knavalbattle.png

data/pictures/hi22-app-knavalbattle.png

data/pictures/hi32-app-knavalbattle.png

data/pictures/hi48-app-knavalbattle.png

data/pictures/hi64-app-knavalbattle.png

kconf_update

kconf_update/CMakeLists.txt

kconf_update/knavalbattle.upd

src/knavalbattle.desktop

src/knavalbattle.kcfg

src/knavalbattle.protocol

src/knavalbattleui.rc

files removed:
data/pictures/hi128-app-kbattleship.png

data/pictures/hi16-app-kbattleship.png

data/pictures/hi22-app-kbattleship.png

data/pictures/hi32-app-kbattleship.png

data/pictures/hi48-app-kbattleship.png

data/pictures/hi64-app-kbattleship.png

src/kbattleship.desktop

src/kbattleship.kcfg

src/kbattleship.protocol

src/kbattleshipui.rc

files modified:
CMakeLists.txt

data/pictures/CMakeLists.txt

data/sounds/CMakeLists.txt

doc/CMakeLists.txt

doc/index.docbook

src/CMakeLists.txt

src/Messages.sh

src/main.cpp

src/settingsbase.kcfgc

Show diffs side-by-side

added added

removed removed

src/knavalbattle.kcfg

<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE kcfg SYSTEM

"http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">

<kcfg>

<include>kglobalsettings.h</include>

<label>Default hostname for multiplayer games.</label>

<default>localhost</default>

</entry>

<label>Default port for multiplayer games.</label>

</entry>

</group>

<label>User nickname.</label>

</entry>

<label>Whether sound effects should be played.</label>

<default>false</default>

</entry>

<label>Allow the ships to be adjacent without one empty space between them.</label>

</entry>

</group>

</kcfg>

Older »