~neon/kolf/master

  • Committer: l10n daemon script
  • Date: 2018-04-18 03:42:01 UTC
  • Revision ID: git-v1:378ad25f9f80290736581f6764d6c9e0b4ec80ed
SVN_SILENT made messages (.desktop file) - always resolve ours

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"
Filename Latest Rev Last Changed Committer Comment Size
..
blackhole.wav 302 21 years ago Jason Katz-Brown add sounds made by Timo Hummel (he's in the about 382 KB Diff Download File
blackholeeject.wav 302 21 years ago Jason Katz-Brown add sounds made by Timo Hummel (he's in the about 25.1 KB Diff Download File
blackholeputin.wav 302 21 years ago Jason Katz-Brown add sounds made by Timo Hummel (he's in the about 88.5 KB Diff Download File
CMakeLists.txt 1158.1.18 9 years ago Montel Laurent Use new macro for use icon on Win/MacOsX. Use new 170 bytes Diff Download File
FROM 303 21 years ago Jason Katz-Brown add note on where these are from svn path=/trunk/ 245 bytes Diff Download File
hit.wav 302 21 years ago Jason Katz-Brown add sounds made by Timo Hummel (he's in the about 11.6 KB Diff Download File
holed.wav 282 21 years ago Jason Katz-Brown add holed.wav, a sound I recorded with my own micr 9.8 KB Diff Download File
holeinone.wav 1 22 years ago Jason Katz-Brown here's kolf, read the TODO svn path=/trunk/kdegam 39.2 KB Diff Download File
puddle.wav 284 21 years ago Jason Katz-Brown make softer svn path=/trunk/kdegames/kolf/; revis 242 KB Diff Download File
wall.wav 1 22 years ago Jason Katz-Brown here's kolf, read the TODO svn path=/trunk/kdegam 471 bytes Diff Download File