Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Feb 2011 20:03:28 +0000 (15:03 -0500)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Feb 2011 20:03:28 +0000 (15:03 -0500)
commit6523713debf3076d8bac93e3262bc589faee286d
tree38994e177fa2326b613c1becad873bced1dfa746
parent9cbfba073af94429cef94c9334efa9a5ad2949d4
parent62dd9e5158192a70f6b1ecef5eb9e85524f175c6
Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert

* 'gilbert' of git://github.com/lapilofu/philo:
  Fixed a faulty image reference on menu buttons FOR REAL.