sudo ./install.sh
changes in compileWithLibraries.sh
Merge remote-tracking branch 'remotes/origin/master' into dev-jaime
Rewind button
manage QSettings and indenting files
MaquetteWidget.cpp conflict resolved
trying to pull
add image rewind
Merge remote-tracking branch 'remotes/origin/dev' into dev-jaime
Drag/drop blocked
Script automatically indenting code according to K&R coding style

uncrustifyFiles.sh is a script that recursively indent the code source with a program called uncrustify.
uncrustify is an indentifier/beautifier program, you can download it from github.
kr_indent.cfg is an uncrustify configuration file I made, inspired by K&R coding style.
OSC load nodes problem fixed
Merge branch 'dev' of https://github.com/nicolashincker/i-score into dev
update headers (forgotten on last commit)
Merge branch 'dev' into dev-jaime

Conflicts:
	src/GUI/BoxWidget.cpp
	src/GUI/NetworkTree.cpp
Doxyfile added, i-score.pro is now pretty and well commented, main.cpp changed and moved
Doxyfile updated (with graphviz/dot package)
uncrustifyFiles.sh applied
i-score.pro cleaned (jamoma part deleted), main.cpp corrected
Merge branch 'dev'

Conflicts:
	Makefile
	compileWithLibraries.sh