Diffusion GCompris 63e1561b4f26

explore_world_animals, merged it's code with ExploreLevels code from…
63e1561b4f26
Actions

Authored by ayushagrawal.

Description

explore_world_animals, merged it's code with ExploreLevels code from explore_monuments

Details

Committed

ayushagrawal

Jan 6 2016, 9:36 PM

Parents

R2:1346094060e0: explore_monuments, Moved README.txt to resource folder and added links and…

Branches

Unknown

Tags

Unknown

ayushagrawal committed R2:63e1561b4f26: explore_world_animals, merged it's code with ExploreLevels code from… (authored by ayushagrawal).Jan 6 2016, 9:36 PM

Restricted Application added a subscriber: jjazeix. · View Herald TranscriptJan 7 2016, 1:18 PM

Changes (21)

		Path
M		src/activities/explore_world_animals/CMakeLists.txt
M		src/activities/explore_world_animals/ExploreWorldAnimals.qml
D		src/activities/explore_world_animals/explore_world_animals.js
P	(dir)	src/activities/explore_world_animals/resource/ Copied to src/activities/explore_world_animals/resource/animals
P	(dir)	src/activities/explore_world_animals/resource/animals/ Copied from src/activities/explore_world_animals/resource
V		src/activities/explore_world_animals/resource/{animals ← }/bison.jpg
V		src/activities/explore_world_animals/resource/{animals ← }/content.svg
V		src/activities/explore_world_animals/resource/{animals ← }/giraffe.jpg
V		src/activities/explore_world_animals/resource/{animals ← }/hedgy.jpg
V		src/activities/explore_world_animals/resource/{animals ← }/jaggy.jpg
V		src/activities/explore_world_animals/resource/{animals ← }/narwhal.jpg
V		src/activities/explore_world_animals/resource/{animals ← }/tux.svg
V		src/activities/explore_world_animals/resource/{ → animals}/bison.jpg
A	(dir)	src/activities/explore_world_animals/resource/board/
A		src/activities/explore_world_animals/resource/board/board1.qml
V		src/activities/explore_world_animals/resource/{ → animals}/content.svg
V		src/activities/explore_world_animals/resource/{ → animals}/giraffe.jpg
V		src/activities/explore_world_animals/resource/{ → animals}/hedgy.jpg
V		src/activities/explore_world_animals/resource/{ → animals}/jaggy.jpg
V		src/activities/explore_world_animals/resource/{ → animals}/narwhal.jpg
V		src/activities/explore_world_animals/resource/{ → animals}/tux.svg