Mercurial > luaevent-prosody / changelog

Merge remote branch 'jsnyder-tree/master'

• Sat, 15 Jan 2011 20:32:15 -0500
• by Thomas Harning Jr <harningt@gmail.com> [Sat, 15 Jan 2011 20:32:15 -0500] rev 102
• Merge remote branch 'jsnyder-tree/master'
  
  Conflicts:
  CHANGELOG
  Makefile
  README

Changes to compile on OS X.

• Wed, 03 Mar 2010 18:19:20 -0600
• by James Snyder <jbsnyder@fanplastic.org> [Wed, 03 Mar 2010 18:19:20 -0600] rev 101
• Changes to compile on OS X.
  
  - BSD version of install doesn't have -D flag
  - stdlib.h should include malloc defs (malloc.h is obsolete)