[Merge] lp:~muktupavels/compiz/cmake-3.10 into lp:compiz

[Dmitry Shachnev]

Diff comments:

> 
> === modified file 'plugins/notification/src/notification.cpp'
> --- plugins/notification/src/notification.cpp	2013-05-09 13:43:07 +0000
> +++ plugins/notification/src/notification.cpp	2019-02-05 17:17:08 +0000
> @@ -64,10 +57,7 @@
>      logLevel = (char *) logLevelToString (level);
>  
>      n = notify_notification_new (logLevel, message,
> -				 iconUri.c_str ()
> -#ifndef HAVE_LIBNOTIFY_0_6_1
> -				 , NULL
> -#endif				 
> +				 iconUri.c_str ()	 

You added unnecessary whitespace at the end of this line.

>  				 );
>  
>      timeout = optionGetTimeout ();


-- 
https://code.launchpad.net/~muktupavels/compiz/cmake-3.10/+merge/362743
Your team Compiz Maintainers is subscribed to branch lp:compiz.