Commit Graph

2 Commits (b17d12c86f3e7414673d653396d2dce2e862b1e3)

Author SHA1 Message Date
madmaxoft@gmail.com 018d941daf Fixed Linux compilation complaining about min() and max(), hopefully forever. Use std::min() and std::max()
git-svn-id: http://mc-server.googlecode.com/svn/trunk@539 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-06-02 14:20:22 +00:00
madmaxoft@gmail.com a4a418a679 Merged the composable_generator branch into the trunk
git-svn-id: http://mc-server.googlecode.com/svn/trunk@504 0a769ca7-a7f5-676a-18bf-c427514a06d6
2012-05-25 07:18:52 +00:00