computer, testing connection to college server not for review
563caf4c8ccd
Actions

Authored by scagarwal.

Description

computer, testing connection to college server not for review

Details

Committed

scagarwal

Aug 6 2015, 5:28 AM

Parents

R2:2df3afb59e80: Merge remote-tracking branch 'origin/master' into gsoc-sagar-computer

Branches

Unknown

Tags

Unknown

scagarwal committed R2:563caf4c8ccd: computer, testing connection to college server not for review (authored by scagarwal).Aug 6 2015, 5:28 AM

Restricted Application added a subscriber: jjazeix. · View Herald TranscriptAug 6 2015, 5:29 AM

Changes (103)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A		.reviewboardrc
M		CMakeLists.txt
M		README.rst
M		android/CMakeLists.txt
M		cmake/rcc.cmake
M		gcompris.appdata.xml
P		platforms/ios/config.h Copied from src/activities/algebra_plus/AlgebraPlus.qml
M		src/activities/activities.txt
M		src/activities/algorithm/algorithm.svg
M		src/activities/babymatch/ActivityInfo.qml
M		src/activities/babymatch/babymatch.svg
M		src/activities/babyshapes/ActivityInfo.qml
M		src/activities/babyshapes/babyshapes.svg
M		src/activities/chronos/ActivityInfo.qml
M		src/activities/chronos/chronos.svg
M		src/activities/colors/ColorItem.qml
M		src/activities/colors/FindIt.qml
M		src/activities/colors/colors.js
M		src/activities/colors/findit.js
P		src/activities/colors/resource/pink_duck.svg Copied from src/activities/colors/resource/purple_duck.svg
M		src/activities/computer/ActivityInfo.qml
M		src/activities/computer/Computer.qml
A		src/activities/computer/Quiz.qml
M		src/activities/computer/computer.js
M		src/activities/computer/resource/images/keyboard.svg
M		src/activities/computer/resource/images/monitor.svg
M		src/activities/computer/resource/images/mouse.svg
M		src/activities/details/ActivityInfo.qml
M		src/activities/details/details.svg
M		src/activities/erase_clic/ActivityInfo.qml
M		src/activities/geo-country/ActivityInfo.qml
M		src/activities/geo-country/france_region.svg
M		src/activities/geo-country/resource/board/board1_0.qml
M		src/activities/geography/ActivityInfo.qml
M		src/activities/geography/globe.svg
M		src/activities/geography/resource/board/board9_0.qml
M		src/activities/gletters/FallingWord.qml
M		src/activities/gletters/gletters.js
P		src/activities/gletters/resource/default-en.json Copied to src/activities/gletters/resource/default-nl.json
P		src/activities/gletters/resource/default-nl.json Copied from src/activities/gletters/resource/default-en.json
P		src/activities/gletters/resource/default-ro.json Copied from src/activities/gletters/resource/default-pt_BR.json
M		src/activities/imageid/lang_api.js
A		src/activities/imageid/resource/content-ca.json
M		src/activities/imageid/resource/content-de.json
M		src/activities/imageid/resource/content-en.json
M		src/activities/imageid/resource/content-es.json
M		src/activities/imageid/resource/content-fr.json
A		src/activities/imageid/resource/content-it.json
M		src/activities/imageid/resource/words.json
M		src/activities/imagename/ActivityInfo.qml
M		src/activities/imagename/imagename.svg
M		src/activities/memory/MemoryCommon.qml
M		src/activities/memory/memory.js
M		src/activities/menu/ConfigurationItem.qml
M		src/activities/missing-letter/missing-letter.js
A	(dir)	src/activities/readingh/
V		{src/activities/readingh/ActivityInfo.qml ← tools/menus/readingh.qml}
A		src/activities/readingh/CMakeLists.txt
A		src/activities/readingh/Readingh.qml
A		src/activities/readingh/readingh.js
V		{src/activities/readingh ← tools/menus/resource}/readingh.svg
A	(dir)	src/activities/readingh/resource/
A		src/activities/readingh/resource/reading-bg.svg
A	(dir)	src/activities/readingv/
V		{src/activities/readingv/ActivityInfo.qml ← tools/menus/readingv.qml}
A		src/activities/readingv/CMakeLists.txt
P		src/activities/readingv/Readingv.qml Copied from src/activities/hanoi/Hanoi.qml
A		src/activities/readingv/reading.svg
M		src/activities/superbrain/ActivityInfo.qml
A		src/activities/superbrain/SearchItem.qml
M		src/activities/superbrain/Superbrain.qml
A		src/activities/superbrain/resource/brown_cross.svg
A		src/activities/superbrain/resource/darkblue_star.svg
A		src/activities/superbrain/resource/darkgreen_ring.svg
A		src/activities/superbrain/resource/lightblue_cloud.svg
A		src/activities/superbrain/resource/lightgreen_triangle.svg
A		src/activities/superbrain/resource/magenta_diamond.svg
A		src/activities/superbrain/resource/red_circle.svg
A		src/activities/superbrain/resource/red_heart.svg
A		src/activities/superbrain/resource/yellow_star.svg
M		src/activities/superbrain/superbrain.js
M		src/activities/traffic/Car.qml
M		src/activities/traffic/Traffic.qml
M		src/activities/traffic/traffic.js
M		src/core/ActivityInfoTree.cpp
M		src/core/AnswerButton.qml
M		src/core/ApplicationInfo.cpp
M		src/core/CMakeLists.txt
M		src/core/GCButtonCancel.qml
M		src/core/GCDialogCheckBox.qml
P		src/core/config.h.in Copied from src/activities/algebra_plus/AlgebraPlus.qml
M		src/core/core.js
M		src/core/main.qml
V		{tools/menus/readingh.qml → src/activities/readingh/ActivityInfo.qml}
V		{tools/menus/readingv.qml → src/activities/readingv/ActivityInfo.qml}
D		tools/menus/resource/reading.svg
V		{tools/menus/resource → src/activities/readingh}/readingh.svg
D		tools/menus/resource/searace.svg
D		tools/menus/resource/searace1player.svg
D		tools/menus/resource/tuxpaint.svg
D		tools/menus/searace.qml
D		tools/menus/searace1player.qml
D		tools/menus/tuxpaint.qml