[tali] (25 commits) Non-fast-forward update to branch wip/mallard-help-merge



The branch 'wip/mallard-help-merge' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  aed2595... help: initial commit with new help
  80f45ab... Review commit: fix as asked in comments
  5a5d451... help: reworded description in game-settings.page
  40d9b43... help: change list to steps, add a new section 'enable-delay
  ae32708... help: merge scores-slot.page with scores.page, change list 
  56fbadf... help: merge start-game.page with play-game.page
  ef44bcb... help: remove start-game.page
  0d7af5a... help: remove score-slot.page
  b504645... help: add advanced section in index.page
  f51067f... help: link players-setting.page to advanced section on inde
  dbb6acf... help: add description in game-settings.page
  7c88521... help: add description in keyboard-shortcuts.page
  8fe9643... help: add description in play-game.page
  9205f18... help: add description in scores.page
  3501256... help: add description in settings.page
  40f7708... help: fix link 'start a new game' in game-settings.page
  69516f8... help: change players-settings.page to settings.page, remove
  c4fc0f9... help: remove backslash from the last help file
  91796dc... help: fix id of game-settings.page
  c182576... help: remove trailing whitespace in help/Makefile.am
  0f271e6... help: add seealso link to play-game.page
  224abfc... help: add seealso to game-settings.page
  5a15de5... help: remove trailing whitespace from keyboard-shortcuts.pa
  1643c09... help: update license in index.page
  ffd6010... help: add <gui> mallard tag against score slots in scores.p
  3471f97... help: correct UI string '5 of a Kind' in play-game.page
  4555d4f... help: add start-game.page in help/Makefile.am
  97b952c... help: add play-game.page to help/Makefile.am
  9715818... help: add score-slots.page to help/Makefile.am
  ac9768b... help: add players-setting.page to help/Makefile.am
  b2719bf... help: add game-settings.page to help/Makefile.am
  6e45b1f... help: add scores.page to help/Makefile.am
  6fd9b49... help: add keyboard-shortcuts.page to help/Makefile.am
  58de24c... Review: fix all
  28b90df... help: rename play-game.page to start-game.page, merged the 
  156a265... help: rephrased the 2nd step
  11bf1a7... help: remove players-setting.page
  41badd6... help: change list to table in keyboard-shortcuts.page
  43ce375... help: rephrased steps in game-settings.page, correct link t
  e5ebbc4... help: reword table in keyboard-shortcuts.page
  cf35ee8... help: updated help/Makefile.am
  b17add0... help: remove trailing whitespace in keyboard-shortcuts.page
  023ca9b... help: remove comment and trailing whitespace from settings.
  595e879... help: add a whitespace after <key>Enter</key> in keyboard-s
  05bd3cd... help: add whitespace in start-game.page
  c10e856... help: remove whitespace from string '5 of a Kind' from star
  bd4704b... help: add fullstops in table content in keyboard-shortcuts.
  70bf74a... help: update version 3.12 to pkgversion 3.14

Commits added to the branch:

  f71fc39... help: initial commit with new help
  60ede7e... Review commit: fix as asked in comments
  dae2622... help: reworded description in game-settings.page
  ab529bc... help: add advanced section in index.page
  c564dc3... help: update players-settings.page
  f2bace0... help: merge scores-slot.page with scores.page
  383ae6b... help: merge start-game.page with play-game.page
  9af2624... help: add description in keyboard-shortcuts.page
  db74a97... help: add description in settings.page
  51518ee... help: update help/Makefile.am
  53824ad... help: add seealso link to play-game.page
  09611bc... help: update license in index.page
  19312f8... help: correct UI string '5 of a Kind' in play-game.page
  e3a8c28... help: add pages to help/Makefile.am
  41bc2e6... Review: fix all
  129e2d0... help: rename play-game.page to start-game.page
  2738eff... help: rephrased paragraph in scores.page
  08fd98c... help: remove players-setting.page
  b00ba20... help: change list to table in keyboard-shortcuts.page
  1bf0b82... help: rephrased steps in game-settings.page
  58668b2... help: updated help/Makefile.am
  77f90ca... help: remove comment and whitespace settings.page
  b66e637... help: update version 3.12 to pkgversion 3.14
  b4526a9... help: put media in media/
  b5c1d35... help: tidy the pages


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]