summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-07-26 00:48:02 (GMT)
committerJean-Baptiste Queru <jbq@google.com>2009-07-26 00:48:02 (GMT)
commitd3f7868bbf80f4b86b475a66550ac313512eecaa (patch)
tree979e65ed00e5eb02b5251c54b87f301086fd4250
parent337cf1ad837227c853e174221c06e3bebe2f624f (diff)
parent30eeb03a677a957edf0be3e3ccbf5d6d016ec23d (diff)
downloadandroid_external_sonivox-d3f7868bbf80f4b86b475a66550ac313512eecaa.zip
android_external_sonivox-d3f7868bbf80f4b86b475a66550ac313512eecaa.tar.gz
android_external_sonivox-d3f7868bbf80f4b86b475a66550ac313512eecaa.tar.bz2
Merge korg/donut into korg/master
-rw-r--r--arm-hybrid-22k/host_src/.DS_Storebin6148 -> 0 bytes
-rw-r--r--arm-hybrid-22k/host_src/._.DS_Storebin82 -> 0 bytes
-rw-r--r--docs/JET_Authoring_Guidelines.html (renamed from docs/JET_Authoring_Guidelines.htm)0
-rw-r--r--docs/JET_Creator_User_Manual.html (renamed from docs/JET_Creator_User_Manual.htm)0
-rw-r--r--docs/JET_Programming_Manual.html (renamed from docs/JET_Programming_Manual.htm)0
-rwxr-xr-xjet_tools/logic_templates/JET_Logic8.logic/LgDoc/displayStatebin0 -> 4245 bytes
-rwxr-xr-xjet_tools/logic_templates/JET_Logic8.logic/LgDoc/documentDatabin0 -> 678442 bytes
-rw-r--r--jet_tools/logic_templates/README.txt1
8 files changed, 1 insertions, 0 deletions
diff --git a/arm-hybrid-22k/host_src/.DS_Store b/arm-hybrid-22k/host_src/.DS_Store
deleted file mode 100644
index 5008ddf..0000000
--- a/arm-hybrid-22k/host_src/.DS_Store
+++ /dev/null
Binary files differ
diff --git a/arm-hybrid-22k/host_src/._.DS_Store b/arm-hybrid-22k/host_src/._.DS_Store
deleted file mode 100644
index c9474ea..0000000
--- a/arm-hybrid-22k/host_src/._.DS_Store
+++ /dev/null
Binary files differ
diff --git a/docs/JET_Authoring_Guidelines.htm b/docs/JET_Authoring_Guidelines.html
index 2ade2e3..2ade2e3 100644
--- a/docs/JET_Authoring_Guidelines.htm
+++ b/docs/JET_Authoring_Guidelines.html
diff --git a/docs/JET_Creator_User_Manual.htm b/docs/JET_Creator_User_Manual.html
index 8582f5f..8582f5f 100644
--- a/docs/JET_Creator_User_Manual.htm
+++ b/docs/JET_Creator_User_Manual.html
diff --git a/docs/JET_Programming_Manual.htm b/docs/JET_Programming_Manual.html
index 198a9e6..198a9e6 100644
--- a/docs/JET_Programming_Manual.htm
+++ b/docs/JET_Programming_Manual.html
diff --git a/jet_tools/logic_templates/JET_Logic8.logic/LgDoc/displayState b/jet_tools/logic_templates/JET_Logic8.logic/LgDoc/displayState
new file mode 100755
index 0000000..f1c6a4a
--- /dev/null
+++ b/jet_tools/logic_templates/JET_Logic8.logic/LgDoc/displayState
Binary files differ
diff --git a/jet_tools/logic_templates/JET_Logic8.logic/LgDoc/documentData b/jet_tools/logic_templates/JET_Logic8.logic/LgDoc/documentData
new file mode 100755
index 0000000..2ff5ed4
--- /dev/null
+++ b/jet_tools/logic_templates/JET_Logic8.logic/LgDoc/documentData
Binary files differ
diff --git a/jet_tools/logic_templates/README.txt b/jet_tools/logic_templates/README.txt
new file mode 100644
index 0000000..471046c
--- /dev/null
+++ b/jet_tools/logic_templates/README.txt
@@ -0,0 +1 @@
+This directory contains Apple Logic template files to facilitate the creation of MIDI files to import in JetCreator. \ No newline at end of file