Diffusion GCompris 4685f308f7d0

(Not for review) 1: Divided images into levels 2: Updated Level 2 and Level 3…
4685f308f7d0
Actions

Authored by scagarwal.

Description

(Not for review) 1: Divided images into levels 2: Updated Level 2 and Level 3 images

Details

Committed

scagarwal

Jun 28 2015, 9:17 PM

Parents

R2:8392ca2f3a3b: 1: Made new branch for hydroelectric 2: Completed Level 1

Branches

Unknown

Tags

Unknown

scagarwal committed R2:4685f308f7d0: (Not for review) 1: Divided images into levels 2: Updated Level 2 and Level 3… (authored by scagarwal).Jun 28 2015, 9:17 PM

Restricted Application added a subscriber: jjazeix. · View Herald TranscriptJun 28 2015, 9:19 PM

Changes (38)

		Path
M		src/activities/hydroelectric/ActivityInfo.qml
M		src/activities/hydroelectric/CMakeLists.txt
M		src/activities/hydroelectric/Hydroelectric.qml
V		src/activities/hydroelectric/resource/{ → hydroelectric}/dam.svg
V		src/activities/hydroelectric/resource/{ → hydroelectric}/damwire.svg
A	(dir)	src/activities/hydroelectric/resource/hydroelectric/
V		src/activities/hydroelectric/resource/{hydroelectric ← }/dam.svg
V		src/activities/hydroelectric/resource/{hydroelectric ← }/damwire.svg
V		src/activities/hydroelectric/resource/{hydroelectric ← }/reservoir1.svg
V		src/activities/hydroelectric/resource/{hydroelectric ← }/reservoir2.svg
V		src/activities/hydroelectric/resource/{hydroelectric ← }/reservoir3.svg
V		src/activities/hydroelectric/resource/{hydroelectric ← }/reservoir4.svg
V		src/activities/hydroelectric/resource/{hydroelectric ← }/reservoir5.svg
P		src/activities/hydroelectric/resource/hydroelectric/stepdown.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/hydroelectric/stepupwire.svg Copied from src/activities/hydroelectric/resource/stepupwire.svg
M		src/activities/hydroelectric/resource/lightson.svg
V		src/activities/hydroelectric/resource/{ → hydroelectric}/reservoir1.svg
V		src/activities/hydroelectric/resource/{ → hydroelectric}/reservoir2.svg
V		src/activities/hydroelectric/resource/{ → hydroelectric}/reservoir3.svg
V		src/activities/hydroelectric/resource/{ → hydroelectric}/reservoir4.svg
V		src/activities/hydroelectric/resource/{ → hydroelectric}/reservoir5.svg
A	(dir)	src/activities/hydroelectric/resource/solar/
P		src/activities/hydroelectric/resource/solar/solarpaneloff.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/solar/solarpanelon.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/solar/solarpoweroff.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/solar/solarpoweron.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/stepdown.svg Deleted after being copied to multiple locations: src/activities/hydroelectric/resource/hydroelectric/stepdown.svg src/activities/hydroelectric/resource/solar/solarpaneloff.svg src/activities/hydroelectric/resource/solar/solarpanelon.svg src/activities/hydroelectric/resource/solar/solarpoweroff.svg src/activities/hydroelectric/resource/solar/solarpoweron.svg src/activities/hydroelectric/resource/wind/turbine1.svg src/activities/hydroelectric/resource/wind/turbine2.svg src/activities/hydroelectric/resource/wind/turbine3.svg src/activities/hydroelectric/resource/wind/turbine4.svg src/activities/hydroelectric/resource/wind/windpoweron.svg
P		src/activities/hydroelectric/resource/stepupwire.svg Deleted after being copied to multiple locations: src/activities/hydroelectric/resource/hydroelectric/stepupwire.svg src/activities/hydroelectric/resource/wind/windpoweroff.svg
A	(dir)	src/activities/hydroelectric/resource/wind/
A		src/activities/hydroelectric/resource/wind/cloud_fury.svg
A		src/activities/hydroelectric/resource/wind/cloud_quiet.svg
P		src/activities/hydroelectric/resource/wind/turbine1.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/wind/turbine2.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/wind/turbine3.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
P		src/activities/hydroelectric/resource/wind/turbine4.svg Copied from src/activities/hydroelectric/resource/stepdown.svg
V		src/activities/hydroelectric/resource/{wind/windpoweroff.svg ← stepupwire.svg}
V		src/activities/hydroelectric/resource/{wind/windpoweron.svg ← stepdown.svg}
M		src/activities/intro_gravity/IntroGravity.qml