]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e41a877 1d55470)
Merge branch 'master' into dev
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 19 Feb 2018 23:37:01 +0000 (00:37 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 19 Feb 2018 23:37:01 +0000 (00:37 +0100)
1  2 
app/scripts/app.sh patch | diff1 | diff2 | blob | history

diff --cc app/scripts/app.sh
index b8eb06a77282256d067a31805d8e905b20f6c389,461191afe337b93fe6d774fd5c2984aa47ae308f..0d70c0c0e339874e5dfd7551b0e55e30f3d4bb07
mode 100755,100644..100755
--- 1/app/scripts/app.sh
--- 2/app/scripts/app.sh
+++ b/app/scripts/app.sh
Unnamed repository; edit this file 'description' to name the repository.