removed conflicts in actvities.txt
Description
Description
Details
Details
- Committed
siddhism Aug 6 2015, 6:01 AM - Parents
- R2:9d2f151e2e19: Programming Maze, push
R2:146c7bb6300c: main, fix a bug in the download of long locale - Branches
- Unknown
- Tags
- References
- refs/backups/branch-gsocSiddheshProgMaze-1438902080
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 146c7bb6300c | bcoudoin | main, fix a bug in the download of long locale | Aug 4 2015 | |||
| 2288dbdc33e7 | bcoudoin | config, fix a bug in the manual download of long locale | Aug 4 2015 | |||
| 6466a11485b4 | bcoudoin | minor improvements to the readme | Aug 4 2015 | |||
| c0b79e8cce4d | bcoudoin | core, fix display on android the screen was half white | Aug 3 2015 | |||
| d6cc2ad08d0f | hkaelberer | superbrain, add configurable shape mode | Aug 3 2015 | |||
| 4740c92a0135 | hkaelberer | superbrain: allow duplicate colors in some levels | Aug 3 2015 | |||
| e54009e1bb7f | jjazeix | imageid, revert and update some French words | Aug 2 2015 | |||
| cfc2ea3be561 | jjazeix | misc, remove useless imports and typos | Aug 2 2015 | |||
| 247e37454ccc | jjazeix | wordsgame, fix some French typo | Aug 2 2015 | |||
| 0f66989b24e1 | jjazeix | fix krazy warning (missing copyright | Aug 2 2015 | |||
| 19070b88b7ad | jjazeix | imageid, fix some French typo | Aug 2 2015 | |||
| ac3acae231f2 | jjazeix | imageid, fix loading of words when the description is different from the audio… | Aug 2 2015 | |||
| 9724c82cf4ed | bcoudoin | imageid, remove extra word in spanish file | Aug 2 2015 | |||
| 05537f5813e9 | bcoudoin | imageid, fix invalid json | Aug 2 2015 | |||
| b16c1e890e29 | bcoudoin | imageid, normalized sound names for numbers | Aug 2 2015 | |||
| 408be048c9f0 | jjazeix | readingh, remove useless QtQuick.Controls import | Aug 2 2015 | |||
| 4a741815a890 | bcoudoin | memory, added a 2s timer before the bonus pop up | Aug 2 2015 | |||
| eff0d7299681 | bcoudoin | findit, added a 2s timer before the bonus pop up | Aug 2 2015 | |||
| bf7d6f41dff5 | bcoudoin | old menus, remove tuxpaint, won't be ported | Aug 2 2015 | |||
| fcf75adba6b9 | bcoudoin | old menus, remove searace it won't be ported | Aug 2 2015 | |||
| 5a767fe45d4d | Antoni Bella Pérez/bcoudoin | imageid, fix file format | Aug 1 2015 | |||
| d2a8178adff1 | bcoudoin | findit, fix position of the score (was under the mouth button) | Aug 1 2015 | |||
| 9507a17bacf5 | bcoudoin | core, add locale exception for voice set zh_TW | Aug 1 2015 | |||
| a407168a6005 | bcoudoin | imageid, fix a spanish word | Aug 1 2015 | |||
| a7a292c73927 | bcoudoin | activity icons, rework to follow new style | Aug 1 2015 | |||
| a5dec5afbfc3 | hkaelberer | superbrain: update manual to cover new features | Jul 28 2015 | |||
| 4d6e71a5bfd6 | hkaelberer | traffic, don't allow moving multiple cars at once | Jul 28 2015 | |||
| b04e0482ab3e | bcoudoin | geography, normalized country audio file for congo. | Jul 28 2015 | |||
| c3297ef96d7c | bcoudoin | gletters, added romanian letters from the english one | Jul 28 2015 | |||
| f090be37d08c | bcoudoin | gletters, fixed english level, several letters was missing | Jul 28 2015 | |||
| 454a1f04c259 | bcoudoin | gletters, added dutch based on the english one | Jul 28 2015 | |||
| c9cbd6a698dd | Luciano Montanaro/bcoudoin | imageid, improved word list | Jul 27 2015 | |||
| acf87a0aef5c | Luciano Montanaro/bcoudoin | imageid, new italian word list | Jul 27 2015 | |||
| 70942cfccb14 | bcoudoin | colors, fix double clickinng issue | Jul 26 2015 | |||
| 1d8fe57f0a8e | bcoudoin | colors, add a pink duck as we have it in audio in many locales | Jul 22 2015 | |||
| b1372764ee77 | bcoudoin | activities, added missing intro voices | Jul 21 2015 | |||
| 6c8ed95f1abb | bcoudoin | missing-letter, this activity is only for english | Jul 21 2015 | |||
| cd86b6a09d1f | Antoni Bella Pérez/bcoudoin | catalan, new resource file for the list of words | Jul 21 2015 | |||
| 16e05f9152c6 | bcoudoin | minor extra space | Jul 21 2015 | |||
| 831555a82f70 | apol | Add a .reviewboardrc file | Jul 20 2015 | |||
| bcfbc5ea9628 | apol | Generate activities qrc files in the build directory | Jul 20 2015 | |||
| b8ace0301285 | bcoudoin | gletters, add support for digraphs | Jul 20 2015 | |||
| 0d78a5ad4072 | bcoudoin | geo_country, added french voices on region | Jul 20 2015 | |||
| ccd9c7a2424a | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 19 2015 | |||
| f2a765952eab | bcoudoin | superbrain, remove the scalefactor that bugs on hdpi screens | Jul 16 2015 | |||
| 351dcdccaa4e | jjazeix | readingh, readingv, new activities | Jul 16 2015 | |||
| d46218e72c5e | bcoudoin | traffic, fix sizing on hdpi screens | Jul 16 2015 | |||
| 7fd83f304f2c | bcoudoin | cmake, remove a useless link directive | Jul 14 2015 | |||
| 9ec6f056a205 | bcoudoin | core, create the main window following the screen aspect ratio | Jul 14 2015 | |||
| 55c385c5ee17 | bcoudoin | core, on desktop with hdpi screen we also need to use m_ratio | Jul 13 2015 |