summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-09-20 17:26:16 -0400
committerKali Kaneko <kali@leap.se>2013-09-20 17:26:16 -0400
commit29fd959940aa42cef90360f2ddd650e40e434e5b (patch)
treeab45ce1cddc22f41d314e3d07a17c599b5c38bed
parent1f0f8efc4cb985c082b3b8fe7b3dc45aed047a47 (diff)
parent637a527e24c8a755cdabb9901b9af417160aeeb2 (diff)
Merge remote-tracking branch 'ivan-github/bug/missed-changes' into develop
-rw-r--r--CHANGELOG1
-rw-r--r--changes/bug-3778_fix-path-prefix-helper1
-rw-r--r--changes/bug-3825-include-resources1
-rw-r--r--changes/bug_3803-do-not-install-resolv-update-globally1
-rw-r--r--changes/bug_fix-first1
5 files changed, 1 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 15db6cd2..ac1aceeb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -27,6 +27,7 @@
- Move the EIP action menu items under the EIP status submenu tree.
o Adds --version flag. Closes: #3816
o Refactors EIPConnection to use LEAPConnection state machine. Closes: #3900
+ o Include resource files and ui in the distrubution tarball. Closes: #3825
0.3.2 Sep 6 -- the "no crashes or anything" release:
o Fix up script in non-bundle linuces. Closes: #3450
diff --git a/changes/bug-3778_fix-path-prefix-helper b/changes/bug-3778_fix-path-prefix-helper
deleted file mode 100644
index e7cec539..00000000
--- a/changes/bug-3778_fix-path-prefix-helper
+++ /dev/null
@@ -1 +0,0 @@
- o Fix path prefix helper for the bundle and add regresion tests. Closes #3778.
diff --git a/changes/bug-3825-include-resources b/changes/bug-3825-include-resources
deleted file mode 100644
index 083fd05d..00000000
--- a/changes/bug-3825-include-resources
+++ /dev/null
@@ -1 +0,0 @@
- o Include resource files and ui in the distrubution tarball. Closes: #3825
diff --git a/changes/bug_3803-do-not-install-resolv-update-globally b/changes/bug_3803-do-not-install-resolv-update-globally
deleted file mode 100644
index f6e06d5f..00000000
--- a/changes/bug_3803-do-not-install-resolv-update-globally
+++ /dev/null
@@ -1 +0,0 @@
- o Do not try to install resolv-update globally. Closes: #3803
diff --git a/changes/bug_fix-first b/changes/bug_fix-first
deleted file mode 100644
index 0ef5188c..00000000
--- a/changes/bug_fix-first
+++ /dev/null
@@ -1 +0,0 @@
- o Catch IndexError on `first` utility.