Merge branch 'feature/qt5' into dev

Conflicts:
	src/data/NetworkMessages.cpp

.gitignore

@@ -1,6 +1,4 @@
-#Ignore Qt build files
 moc_*
-
 i-score.app/
 i-score.pro.user #ne faut-il pas plutot les partager pour avoir les meme configurations Qt Creator
 i-score.pro.user.* #ne faut-il pas plutot les partager pour avoir les meme configurations Qt Creator
@@ -16,17 +14,12 @@ installation/acousmoscribe_MacOS_10_4*
 installation/acousmoscribe_ubuntu32*
 installation/acousmoscribe_ubuntu64*
 /i-score.app/Contents/MacOS/i-score
-
-#Ignore DS_Store files
 .DS_Store
-
 logs
 build
 Debug
 Release
 Makefile
-
-# XCode files to be ignored
 xcuserdata
 *.mode1v3
 *.pbxuser
@@ -36,29 +29,21 @@ xcuserdata
 *.pbxproj
 project.xcworkspace
 *.mak
-
 *.layout
 *.depends
-#*.map
 *.ncb
 *.suo
 *.user
 *.tm_build_errors
 *.a
 *.lib
-
-# Git conflict files
 *.orig
 *.o
-
-# html generated by doxygen
 doxygen/html/
 /qrc_i-score.cpp
 /DerivedData/i-score/Index/i-score.hmap
 /i-score/Index/i-score.hmap
-
 /src/.DS_Store
-
-# Eclipse
 .cproject
 .project
+i-score.pro.user.3.2-pre1

Examples/Jamoma_demo/Demo cues.maxproj

@@ -0,0 +1,50 @@
+{
+	"name" : "Demo cues",
+	"version" : 1,
+	"creationdate" : -801741194,
+	"modificationdate" : -801741119,
+	"viewrect" : [ 270.0, 44.0, 300.0, 500.0 ],
+	"autoorganize" : 1,
+	"hideprojectwindow" : 0,
+	"showdependencies" : 1,
+	"autolocalize" : 0,
+	"contents" : 	{
+		"patchers" : 		{
+			"audiotrack.maxpat" : 			{
+				"kind" : "patcher",
+				"local" : 1
+			}
+,
+			"mediaPlayer.maxpat" : 			{
+				"kind" : "patcher",
+				"local" : 1,
+				"toplevel" : 1
+			}
+,
+			"videotrack.maxpat" : 			{
+				"kind" : "patcher",
+				"local" : 1
+			}
+
+		}
+,
+		"externals" : 		{
+
+		}
+,
+		"other" : 		{
+
+		}
+
+	}
+,
+	"layout" : 	{
+
+	}
+,
+	"searchpath" : 	{
+
+	}
+,
+	"detailsvisible" : 0
+}