e0a721c103
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" |
||
---|---|---|
.. | ||
bugreport | ||
compactrepresentation | ||
conditionalloader | ||
config | ||
dataenginemodel | ||
helloworld | ||
notes | ||
nowplaying | ||
pairsgame/contents/ui | ||
qmltasks | ||
samegame | ||
testcomponents | ||
testshaders | ||
testtheme | ||
widgetgallery | ||
windowthumbnails | ||
CMakeLists.txt |