[gnome-klotski] (122 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:

  a11ac64... help: Remove old docbook help
  d33f88e... Do not create new fundamental types
  7f4c317... Fix i18n of the gschema file
  ee1db86... Switch the two window buttons
  d300594... Revert "Switch the two window buttons"
  ae8729a... Updated Russian translation
  1ecbb6b... Updated Hungarian translation
  b5b1c93... help: Add index.page
  c65ea15... help: Add rules.page
  3bbccd2... help: Add puzzles.page
  bede864... help: Add start-game.page
  a6742f1... help: Add scores.page
  3ae95cd... help: Add puzzles-moves.page
  03f4c96... help: Add moves.page
  cddf97e... help: Add game-introduction page
  ce3ccdf... help: Add keyboard shortcuts page
  1889f23... Review commits
  f8d8731... help: rephrased the description, fixed the introduction lin
  f8232f7... help: removed game-introduction.page
  ad023c3... help: changed name from game-introduction to introduction, 
  87c7f30... help: merged puzzle-moves.page with puzzles.page
  a71cdfc... help: add minimum-number-of-moves section to puzzles.page
  8ebc3d3... help: rephrased the steps in scores.page
  a3f6fe6... help: rename shortcuts.page to keyboard-shortcuts.page
  15931ce... help: break the first sentence in the 'patterend-block-move
  82b0905... help: shifted 'rules' section above 'move-block' section, u
  cddcfd8... help: removed 'new-game-on-close' section, updated the step
  f544f67... help: removed trailing whitespace in start-game.page
  51d39f4... help: remove whitespace in start-game.page
  f9c7a18... help: arranged pages alphabetically in help/Makefile.am, re
  a05254f... help: remove trailing whitespace in help/Makefile.am
  93ffd65... help: remove trailing whitespace in index.page
  8256f66... help: remove trailing whitespace in moves.page
  951a54b... help: remove trailing whitespace in puzzles.page
  7fec533... help: remove trailing whitespace in keyboard-shortcuts.page
  87677c7... help: correct UI string, from 'Only 18 steps' to 'Only 18 S
  3e9a7e2... help: corrected 'block cannot be move over' to 'block canno
  3caba4f... help: correct UI string, from 'Only 18 steps' to 'Only 18 S
  133d227... help: add fullstop at the end of desc
  e3c8e32... help: add fullstop in puzzles.page
  6aad218... help: correct title link to 79 characters
  0ef2a67... help: add fullstop at the end in moves.page
  cfa6cf0... help: add fullstop in desc in index.page
  d836f47... help: link introduction.page to index#play
  ff3af0a... help: change 'see' to 'view' in moves.page
  6ce7e7d... help: updated license tag in index.page
  fa1c97a... help: update revision version from 3.12 to 3.14
  d4bbb4f... help: update revision version from 3.12 to 3.14 in puzzles.
  9776ad2... help: update revision version from 3.12 to 3.14 in scores.p
  2c8d744... help: update revision version from 3.12 to 3.14 in index.pa
  23687c9... help: update revision version from 3.12 to 3.14 in keyboard
  e81c89c... help: update revision version from 3.12 to 3.14 in moves.pa
  a5f6ccc... help: update revision version from 3.12 to 3.14 in rules.pa
  47692e0... help: update revision version from 3.12 to 3.14 in start-ga
  ee39423... help: link introduction page to index
  cd57a37... doap: replace Jason with myself
  4ead6a6... Update POTFILES.skip
  c7d0f47... help: remove start-game.page
  8a0f71e... help: rename start-game.page to start.page in help/Makefile
  7fc602c... help: rename start-game.page to start.page
  1b19767... Updated Greek translation
  0d093dc... Remove white spaces.
  c101b1c... Add --version command-line option.
  5ee756e... Updated Spanish translation
  2aec137... Updated Norwegian bokmål translation.
  865e4d0... Updated Hungarian translation
  745278a... Updated Lithuanian translation
  d262f92... doap category apps
  225d891... doap: add <programming-language>
  a3b6672... Updated Greek translation
  ebd8922... Updated Basque language
  e8767e3... [l10n] Updated Catalan translation
  f0205ce... [l10n] Updated Catalan (Valencian) translation
  d32a96f... Use the same buttons as Iagno and Sudoku.
  7b22b11... Cool buttons are cool.
  c901891... Prepare 3.13.90
  3991d6d... Updated Swedish translation
  8992e0a... Updated Hebrew translation
  35ecc5f... Updated Czech translation
  8162276... Fix incorrect id in help/Makefile.am
  59961c1... help: rephrase description in index.page
  ca20d5f... help: rephrase desc in keyboard-shortcuts.page
  d90beaf... help: link start.page to index
  fddf940... help: merge two sections in rules.page
  7290e71... help: write id, type in a single line in introduction.page
  52e705c... help: rephrase moves.page
  36f1bd6... help: write id, type in one line
  34d698c... help: write id, type in one line in moves.page
  c34ead5... help: write id, type in one line in puzzles.page
  91d587a... help: write id, type in one line in rules.page
  b5ae9fe... help: write id, type in one line in scores.page
  f30ee98... help: add id, type in one line in start.page

Commits added to the branch:

  fef4861... Do not create new fundamental types (*)
  7fd204b... Fix i18n of the gschema file (*)
  22351e5... Switch the two window buttons (*)
  7b0ec1d... Revert "Switch the two window buttons" (*)
  4e622a7... Updated Russian translation (*)
  d155875... Updated Hungarian translation (*)
  57835da... doap: replace Jason with myself (*)
  6b1c398... Update POTFILES.skip (*)
  c97abc8... Updated Greek translation (*)
  1784925... Remove white spaces. (*)
  3d8b916... Add --version command-line option. (*)
  7a0604b... Updated Spanish translation (*)
  70cc247... Updated Norwegian bokmål translation. (*)
  0f246eb... Updated Hungarian translation (*)
  295a3b5... Updated Lithuanian translation (*)
  2a2ce7c... doap category apps (*)
  c6e2aa7... doap: add <programming-language> (*)
  81a7b9d... Updated Greek translation (*)
  72f2305... Updated Basque language (*)
  17049c5... [l10n] Updated Catalan translation (*)
  5c21453... [l10n] Updated Catalan (Valencian) translation (*)
  45ea418... Use the same buttons as Iagno and Sudoku. (*)
  e32176c... Cool buttons are cool. (*)
  09599e0... Prepare 3.13.90 (*)
  8d2c17b... Updated Swedish translation (*)
  c1dc9ec... Updated Hebrew translation (*)
  48c2fe8... Updated Czech translation (*)
  8b7b9cd... Updated Traditional Chinese translation(Hong Kong and Taiwa (*)
  37f1572... Updated Assamese translation (*)
  8a658cf... Updated Brazilian Portuguese translation (*)
  0039049... Updated French translation (*)
  8d40702... Updated Galician translations (*)
  95bde82... Updated Indonesian translation (*)
  eda9a1a... Updated Korean translation (*)
  6cf5f2b... Updated Korean translation (*)
  c0dc9a7... Updated Polish translation (*)
  c19b583... Updated Russian translation (*)
  1f02d8d... Finnish translation update by Jiri Grönroos (*)
  c91d349... Updated Slovenian translation (*)
  2a77425... Updated Slovak translation (*)
  eb60b6d... Updated German translation (*)
  48ac29b... Updated Serbian translation (*)
  632dfb1... Updated Danish translation (*)
  319d762... appdata: update screenshot size (*)
  8c91212... Set the vala requirement to something reasonable (*)
  db6cb74... Prepare 3.14.0 (*)
  34883a1... Bump required Gtk version to 3.12 (*)
  7ef9244... Use set_accels_for_action(). (*)
  28e61bd... Require vala 0.24 (*)
  69eab7d... Updated Latvian translation (*)
  0149f5f... Updated Italian translation (*)
  9959ff7... Code convention fixes (*)
  71e1354... Change Finnish translation team web page to l10n.gnome.org (*)
  7e83291... Updated Portuguese translation (*)
  b8858e6... Switch from appdata-tools to appstream-util (*)
  1d32bbc... Updated Czech translation (*)
  9ccae49... Updated Turkish translation (*)
  f92aa30... help: Remove old docbook help
  f98366d... help: Add index.page
  e022ed6... help: Add rules.page
  fd16c4a... help: Add puzzles.page
  25395a0... help: Add start-game.page
  92e9c74... help: Add scores.page
  426256e... help: Add puzzles-moves.page
  016cc23... help: Add moves.page
  f6e1357... help: Add game-introduction page
  85e53ef... help: Add keyboard shortcuts page
  a75037b... Review commits
  ebea994... help: rephrased the description, fixed the introduction lin
  9fa9bed... help: removed game-introduction.page
  86ee576... help: changed name from game-introduction to introduction, 
  2bd7bf7... help: merged puzzle-moves.page with puzzles.page
  515387e... help: add minimum-number-of-moves section to puzzles.page
  b962773... help: rephrased the steps in scores.page
  981c21b... help: rename shortcuts.page to keyboard-shortcuts.page
  f8ed22f... help: break the first sentence in the 'patterend-block-move
  4fd1bcc... help: shifted 'rules' section above 'move-block' section, u
  79d4410... help: removed 'new-game-on-close' section, updated the step
  95a5c26... help: removed trailing whitespace in start-game.page
  7b7c441... help: remove whitespace in start-game.page
  e4021eb... help: arranged pages alphabetically in help/Makefile.am, re
  5e600a2... help: remove trailing whitespace in help/Makefile.am
  d3b98f7... help: remove trailing whitespace in index.page
  b2d8784... help: remove trailing whitespace in moves.page
  4590e1c... help: remove trailing whitespace in puzzles.page
  a339963... help: remove trailing whitespace in keyboard-shortcuts.page
  4ae78c1... help: correct UI string, from 'Only 18 steps' to 'Only 18 S
  be5abed... help: corrected 'block cannot be move over' to 'block canno
  64f8bfb... help: correct UI string, from 'Only 18 steps' to 'Only 18 S
  9d1c4bc... help: add fullstop at the end of desc
  81ac493... help: add fullstop in puzzles.page
  83d5000... help: correct title link to 79 characters
  5ffbc6b... help: add fullstop at the end in moves.page
  b565847... help: add fullstop in desc in index.page
  5eb3723... help: link introduction.page to index#play
  2d5f86c... help: change 'see' to 'view' in moves.page
  2f6f91e... help: updated license tag in index.page
  d5b1f19... help: update revision version from 3.12 to 3.14
  00da6e2... help: update revision version from 3.12 to 3.14 in puzzles.
  973f2cf... help: update revision version from 3.12 to 3.14 in scores.p
  036d697... help: update revision version from 3.12 to 3.14 in index.pa
  983ba53... help: update revision version from 3.12 to 3.14 in keyboard
  487b67a... help: update revision version from 3.12 to 3.14 in moves.pa
  960ef6a... help: update revision version from 3.12 to 3.14 in rules.pa
  fd08850... help: update revision version from 3.12 to 3.14 in start-ga
  44eee50... help: link introduction page to index
  7d34b88... help: remove start-game.page
  5d46686... help: rename start-game.page to start.page in help/Makefile
  7668988... help: rename start-game.page to start.page
  012110e... Fix incorrect id in help/Makefile.am
  78fbd78... help: rephrase description in index.page
  98acad4... help: rephrase desc in keyboard-shortcuts.page
  cfeaba6... help: link start.page to index
  523c2c8... help: merge two sections in rules.page
  78e67e4... help: write id, type in a single line in introduction.page
  5e19cdf... help: rephrase moves.page
  9424ebb... help: write id, type in one line
  5dd4e5a... help: write id, type in one line in moves.page
  633b54d... help: write id, type in one line in puzzles.page
  fd67f59... help: write id, type in one line in rules.page
  7ca3698... help: write id, type in one line in scores.page
  f50a5c8... help: add id, type in one line in start.page

(*) This commit already existed in another branch; no separate mail sent


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