From: Julia Baudier <jbaudier@argeo.org>
Date: Wed, 6 Dec 2017 07:43:27 +0000 (+0100)
Subject: Merge branch 'master' of https://code.argeo.org/git/gpl/argeo-suite.git
X-Git-Tag: argeo-suite-0.1.12~11
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=39294b07f7b4c4b92acec003a11ac201347c0146;hp=de075b8c56142f63e103964c97c94ff218d1612e

Merge branch 'master' of https://code.argeo.org/git/gpl/argeo-suite.git
---

diff --git a/.gitignore b/.gitignore
index b83d222..e3d2422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /target/
+/.DS_Store
diff --git a/org.argeo.suite.theme.argeo2/icons/.gitignore b/org.argeo.suite.theme.argeo2/icons/.gitignore
new file mode 100644
index 0000000..9bb88d3
--- /dev/null
+++ b/org.argeo.suite.theme.argeo2/icons/.gitignore
@@ -0,0 +1 @@
+/.DS_Store
diff --git a/org.argeo.suite.theme.argeo2/icons/actions/.gitignore b/org.argeo.suite.theme.argeo2/icons/actions/.gitignore
new file mode 100644
index 0000000..9bb88d3
--- /dev/null
+++ b/org.argeo.suite.theme.argeo2/icons/actions/.gitignore
@@ -0,0 +1 @@
+/.DS_Store
diff --git a/org.argeo.suite.theme.argeo2/icons/actions/add.png b/org.argeo.suite.theme.argeo2/icons/actions/add.png
index 4d07330..166ae77 100644
Binary files a/org.argeo.suite.theme.argeo2/icons/actions/add.png and b/org.argeo.suite.theme.argeo2/icons/actions/add.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/contactTypes/.gitignore b/org.argeo.suite.theme.argeo2/icons/contactTypes/.gitignore
new file mode 100644
index 0000000..9bb88d3
--- /dev/null
+++ b/org.argeo.suite.theme.argeo2/icons/contactTypes/.gitignore
@@ -0,0 +1 @@
+/.DS_Store
diff --git a/org.argeo.suite.theme.argeo2/icons/fs/.gitignore b/org.argeo.suite.theme.argeo2/icons/fs/.gitignore
new file mode 100644
index 0000000..9bb88d3
--- /dev/null
+++ b/org.argeo.suite.theme.argeo2/icons/fs/.gitignore
@@ -0,0 +1 @@
+/.DS_Store
diff --git a/org.argeo.suite.theme.argeo2/icons/primary.png b/org.argeo.suite.theme.argeo2/icons/primary.png
new file mode 100644
index 0000000..3235a8f
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/primary.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/primaryNOT.png b/org.argeo.suite.theme.argeo2/icons/primaryNOT.png
new file mode 100644
index 0000000..3d1a809
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/primaryNOT.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/.gitignore b/org.argeo.suite.theme.argeo2/icons/types/.gitignore
new file mode 100644
index 0000000..9bb88d3
--- /dev/null
+++ b/org.argeo.suite.theme.argeo2/icons/types/.gitignore
@@ -0,0 +1 @@
+/.DS_Store
diff --git a/org.argeo.suite.theme.argeo2/icons/types/dashboard.png b/org.argeo.suite.theme.argeo2/icons/types/dashboard.png
new file mode 100644
index 0000000..5eb0967
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/types/dashboard.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/group.png b/org.argeo.suite.theme.argeo2/icons/types/group.png
new file mode 100644
index 0000000..cc6683a
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/types/group.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/milestone.png b/org.argeo.suite.theme.argeo2/icons/types/milestone.png
new file mode 100644
index 0000000..4c77a79
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/types/milestone.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/organisation.png b/org.argeo.suite.theme.argeo2/icons/types/organisation.png
index 06aa725..814734b 100644
Binary files a/org.argeo.suite.theme.argeo2/icons/types/organisation.png and b/org.argeo.suite.theme.argeo2/icons/types/organisation.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/person.png b/org.argeo.suite.theme.argeo2/icons/types/person.png
new file mode 100644
index 0000000..7d979a5
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/types/person.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/project.png b/org.argeo.suite.theme.argeo2/icons/types/project.png
new file mode 100644
index 0000000..24abfd8
Binary files /dev/null and b/org.argeo.suite.theme.argeo2/icons/types/project.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/task.png b/org.argeo.suite.theme.argeo2/icons/types/task.png
index 3f56074..5c89719 100644
Binary files a/org.argeo.suite.theme.argeo2/icons/types/task.png and b/org.argeo.suite.theme.argeo2/icons/types/task.png differ
diff --git a/org.argeo.suite.theme.argeo2/icons/types/todo.png b/org.argeo.suite.theme.argeo2/icons/types/todo.png
index 3f56074..5c89719 100644
Binary files a/org.argeo.suite.theme.argeo2/icons/types/todo.png and b/org.argeo.suite.theme.argeo2/icons/types/todo.png differ