Merge branch 'master' into core-updates

1 files changed, 11 insertions, 0 deletions

diff --git a/gnu-system.am b/gnu-system.am
index f1ebe40703f..0e912f280e0 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -96,6 +96,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/freeipmi.scm                     \
   gnu/packages/ftp.scm                          \
   gnu/packages/fribidi.scm                      \
+  gnu/packages/game-development.scm             \
   gnu/packages/games.scm                        \
   gnu/packages/gawk.scm                         \
   gnu/packages/gcal.scm                         \
@@ -377,6 +378,15 @@ dist_patch_DATA =						\
   gnu/packages/patches/guix-test-networking.patch               \
   gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
   gnu/packages/patches/hop-bigloo-4.0b.patch                    \
+  gnu/packages/patches/icecat-CVE-2014-1587-bug-1042567.patch   \
+  gnu/packages/patches/icecat-CVE-2014-1587-bug-1072847.patch   \
+  gnu/packages/patches/icecat-CVE-2014-1587-bug-1079729.patch   \
+  gnu/packages/patches/icecat-CVE-2014-1587-bug-1080312.patch   \
+  gnu/packages/patches/icecat-CVE-2014-1587-bug-1089207.patch   \
+  gnu/packages/patches/icecat-CVE-2014-1590.patch               \
+  gnu/packages/patches/icecat-CVE-2014-1592.patch               \
+  gnu/packages/patches/icecat-CVE-2014-1593.patch               \
+  gnu/packages/patches/icecat-CVE-2014-1594.patch               \
   gnu/packages/patches/inkscape-stray-comma.patch               \
   gnu/packages/patches/jbig2dec-ignore-testtest.patch           \
   gnu/packages/patches/kmod-module-directory.patch              \
@@ -450,6 +460,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/wmctrl-64-fix.patch                      \
   gnu/packages/patches/xf86-input-synaptics-glibc-2.20.patch    \
   gnu/packages/patches/xf86-video-openchrome-includes.patch     \
+  gnu/packages/patches/xfce4-panel-plugins.patch                \
   gnu/packages/patches/xmodmap-asprintf.patch
 
 bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap