Homec4science

Merge branch 'master' into 'aw_solar'

Authored by rcastello on Feb 28 2018, 09:31.

Description

Merge branch 'master' into 'aw_solar'

  1. Conflicts:
  2. .gitignore

Details

Committed
rcastelloFeb 28 2018, 09:31
Pushed
rcastelloApr 25 2019, 16:23
Parents
R8800:a1e97d07bc09: Merge branch 'test_branch' into 'master'
R8800:4ae9e3af112f: del test files
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
a1e97d07bc09rcastello
Merge branch 'test_branch' into 'master' 
Feb 23 2018
e002dc81c19frcastello
Changing the HowTo 
Feb 23 2018
df2753c30a64rcastello
Renaming the HowTo 
Feb 23 2018
fcd39e2a519drcastello
Updating the HowTo 
Feb 23 2018
74adf018bf60rcastello
First test 
Feb 23 2018
f5e29d1c3197rcastello
add README 
Feb 22 2018