comparison libpurple/util.c @ 15687:95d67f46bb93

More icons and icon improvements

15682:f344b5cc2fc9

	signal(SIGALRM, SIG_DFL);	/* 14: real-time timer expired */
	signal(SIGTERM, SIG_DFL);	/* 15: software termination signal */
	signal(SIGCHLD, SIG_DFL);	/* 20: child status has changed */
	signal(SIGXCPU, SIG_DFL);	/* 24: exceeded CPU time limit */
	signal(SIGXFSZ, SIG_DFL);	/* 25: exceeded file size limit */	
<<<<<<< variant A
#endif /* HAVE_SIGNAL_H */
#endif /* !_WIN32 */
>>>>>>> variant B
#endif /* HAVE_SIGNAL_H */
####### Ancestor
#endif
======= end
}

15687:95d67f46bb93

	signal(SIGALRM, SIG_DFL);	/* 14: real-time timer expired */
	signal(SIGTERM, SIG_DFL);	/* 15: software termination signal */
	signal(SIGCHLD, SIG_DFL);	/* 20: child status has changed */
	signal(SIGXCPU, SIG_DFL);	/* 24: exceeded CPU time limit */
	signal(SIGXFSZ, SIG_DFL);	/* 25: exceeded file size limit */	
#endif /* HAVE_SIGNAL_H */
#endif /* !_WIN32 */
}