From 44c4c6c127bb4689a17c465b6c21a155cea085b5 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 4 Feb 2015 17:55:49 +0100
Subject: [PATCH 1/3] oh-my-zsh upgrade

---
 .oh-my-zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.oh-my-zsh b/.oh-my-zsh
index c78277fd..550ccca9 160000
--- a/.oh-my-zsh
+++ b/.oh-my-zsh
@@ -1 +1 @@
-Subproject commit c78277fd8bda5fec87504469afdf121355876006
+Subproject commit 550ccca91cb45fcf26a8f2c3c60da675b995e3f3

From 6c85ecc68ebab6cf0850aeebdbee5f5b6db5d9dd Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Fri, 6 Feb 2015 19:44:41 +0100
Subject: [PATCH 2/3] kicad modules added

---
 .gitmodules | 3 +++
 .kicad      | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 .kicad

diff --git a/.gitmodules b/.gitmodules
index ab3767b7..dafa3407 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,3 +41,6 @@
 [submodule ".vim/bundle/splice"]
 	path = .vim/bundle/splice
 	url = https://github.com/sjl/splice.vim.git
+[submodule ".kicad"]
+	path = .kicad
+	url = git@github.com:KiCad/kicad-library.git
diff --git a/.kicad b/.kicad
new file mode 160000
index 00000000..81f5d8ce
--- /dev/null
+++ b/.kicad
@@ -0,0 +1 @@
+Subproject commit 81f5d8cecda3ea660e6a4df98a46ed45b633cf99

From 48c0a6f8da00c726504af017dcc58da8c1183d2c Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Sun, 8 Feb 2015 09:17:27 +0100
Subject: [PATCH 3/3] kdiff3 added to the base ubuntu install

---
 ubuntu/configure_fresh_system | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system
index 3156183b..9461ce76 100755
--- a/ubuntu/configure_fresh_system
+++ b/ubuntu/configure_fresh_system
@@ -1,7 +1,7 @@
 #!/bin/bash
 sudo apt-get update
 sudo apt-get dist-upgrade -y
-sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar thunderbird mercurial
+sudo apt-get install -y meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar thunderbird mercurial kdiff3
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"