Merge tag 'upstream/1.1.91'

Upstream version 1.1.91

1 files changed, 1 insertions, 4 deletions

diff --git a/CONTRIBUTING b/CONTRIBUTING
index 47f93700..d3ea0ce7 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -21,13 +21,10 @@ with #ifdef MY_DEFINE / #endif in the code.
     GOOD: g_strdup (x)
     BAD:  g_strdup(x)
 
-* C-style comments, except for FIXMEs.
+* C-style comments
     GOOD: f(x);  /* comment */
     BAD:  f(x);  // comment
 
-    GOOD: // FIXME: juice the gooblygok
-    BAD:  /* FIXME: juice the gooblygok */
-
 * Keep assignments in the variable declaration area pretty short.
     GOOD: MyObject *object;
     BAD: MyObject *object = complex_and_long_init_function(arg1, arg2, arg3);