Diffusion GCompris db11f0a7bb2b

explore_world_music, merged it's code with ExploreLevels code from…
db11f0a7bb2b
Actions

Authored by ayushagrawal.

Description

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

Details

Committed

ayushagrawal

Jan 6 2016, 9:52 PM

Parents

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

Branches

Unknown

Tags

Unknown

ayushagrawal committed R2:db11f0a7bb2b: explore_world_music, merged it's code with ExploreLevels code from… (authored by ayushagrawal).Jan 6 2016, 9:52 PM

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

Changes (47)

		Path
M		src/activities/explore_world_music/CMakeLists.txt
M		src/activities/explore_world_music/ExploreWorldMusic.qml
D		src/activities/explore_world_music/explore_world_music.js
P	(dir)	src/activities/explore_world_music/resource/ Copied to src/activities/explore_world_music/resource/music
V		src/activities/explore_world_music/resource/{ → music}/africa.jpg
V		src/activities/explore_world_music/resource/{ → music}/africa.ogg
V		src/activities/explore_world_music/resource/{ → music}/america.jpg
V		src/activities/explore_world_music/resource/{ → music}/america.ogg
V		src/activities/explore_world_music/resource/{ → music}/australia.jpg
V		src/activities/explore_world_music/resource/{ → music}/australia.ogg
V		src/activities/explore_world_music/resource/{ → music}/beethoven.ogg
A	(dir)	src/activities/explore_world_music/resource/board/
A		src/activities/explore_world_music/resource/board/board1.qml
V		src/activities/explore_world_music/resource/{ → music}/content.svg
V		src/activities/explore_world_music/resource/{ → music}/ireland.jpg
V		src/activities/explore_world_music/resource/{ → music}/ireland.ogg
V		src/activities/explore_world_music/resource/{ → music}/italy.jpg
V		src/activities/explore_world_music/resource/{ → music}/italy.ogg
V		src/activities/explore_world_music/resource/{ → music}/japan.jpg
V		src/activities/explore_world_music/resource/{ → music}/japan.ogg
V		src/activities/explore_world_music/resource/{ → music}/mexico.jpg
V		src/activities/explore_world_music/resource/{ → music}/mexico.ogg
V		src/activities/explore_world_music/resource/{ → music}/middleeast.jpg
V		src/activities/explore_world_music/resource/{ → music}/middleeast.ogg
P	(dir)	src/activities/explore_world_music/resource/music/ Copied from src/activities/explore_world_music/resource
V		src/activities/explore_world_music/resource/{music ← }/africa.jpg
V		src/activities/explore_world_music/resource/{music ← }/africa.ogg
V		src/activities/explore_world_music/resource/{music ← }/america.jpg
V		src/activities/explore_world_music/resource/{music ← }/america.ogg
V		src/activities/explore_world_music/resource/{music ← }/australia.jpg
V		src/activities/explore_world_music/resource/{music ← }/australia.ogg
V		src/activities/explore_world_music/resource/{music ← }/beethoven.ogg
V		src/activities/explore_world_music/resource/{music ← }/content.svg
V		src/activities/explore_world_music/resource/{music ← }/ireland.jpg
V		src/activities/explore_world_music/resource/{music ← }/ireland.ogg
V		src/activities/explore_world_music/resource/{music ← }/italy.jpg
V		src/activities/explore_world_music/resource/{music ← }/italy.ogg
V		src/activities/explore_world_music/resource/{music ← }/japan.jpg
V		src/activities/explore_world_music/resource/{music ← }/japan.ogg
V		src/activities/explore_world_music/resource/{music ← }/mexico.jpg
V		src/activities/explore_world_music/resource/{music ← }/mexico.ogg
V		src/activities/explore_world_music/resource/{music ← }/middleeast.jpg
V		src/activities/explore_world_music/resource/{music ← }/middleeast.ogg
V		src/activities/explore_world_music/resource/{music ← }/orchestra.jpg
V		src/activities/explore_world_music/resource/{music ← }/suitcase.svg
V		src/activities/explore_world_music/resource/{ → music}/orchestra.jpg
V		src/activities/explore_world_music/resource/{ → music}/suitcase.svg