Merge lp:~smspillaz/compiz-libcompizconfig/compiz-libcompizconfig.primary_control_mask into lp:compiz-libcompizconfig

[Sam Spilsbury]

GTK is stupid and uses Primary instead of Control, so allow Primary too, but convert it to ControlMask

[Alan Griffiths (alan-griffiths)]

Are the news updates showing in the diff related?

review: Approve

[Didier Roche-Tolomelli (didrocks)]

works well, thanks for the workaround same :)

review: Approve

=== modified file 'NEWS'
--- NEWS	2011-08-19 21:33:13 +0000
+++ NEWS	2012-02-22 11:35:04 +0000
@@ -1,3 +1,11 @@
+Release 0.9.7.1 ( 2012-01-26 smspillaz <[e-mail]> ) 
+=======================================================================
+
+ Fixes bugs:
+   - LP #872922 CCSM crashes in ccsCanDisablePlugin when using "reset to defaults"CCSM crashes in ccsCanDisablePlugin when using "reset to defaults"
+   - LP #874842 Make upgrades be read from DATADIR and not SYSCONFDIR
+ 
+
 Release 0.9.5.92 ( 2011-08-20 Sam Spilsbury <[e-mail]> ) 
 ============================================================================
 Development Release (0.9.5.92)

=== modified file 'VERSION'
--- VERSION	2011-08-19 21:33:13 +0000
+++ VERSION	2012-02-22 11:35:04 +0000
@@ -1,1 +1,1 @@
-0.9.5.94
+0.9.7.1

=== modified file 'src/bindings.c'
--- src/bindings.c	2009-09-01 04:17:14 +0000
+++ src/bindings.c	2012-02-22 11:35:04 +0000
@@ -65,6 +65,7 @@
 modifierList[] = {
     { "<Shift>",      ShiftMask		 },
     { "<Control>",    ControlMask	 },
+    { "<Primary>",    ControlMask        },
     { "<Mod1>",	      Mod1Mask		 },
     { "<Mod2>",	      Mod2Mask		 },
     { "<Mod3>",	      Mod3Mask		 },