Merge pull request #129 from philsquared/Integration

regen test 2
This commit is contained in:
Phil Nash 2012-10-12 10:23:53 -07:00
commit 9bcbe8c361

View File

@ -1,5 +1,5 @@
/* /*
* Generated: 2012-10-12 08:05:21.766821 * Generated: 2012-10-12 18:17:54.059305
* ---------------------------------------------------------- * ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly * This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.