2 commits

Author	SHA1	Message	Date
LexManos	49385961d9	Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain.	2012-08-10 18:25:11 -07:00
LexManos	ac8945a4f8	Stage 1 of merging the client and server for MCP. ... Results: Client: 362 Server: 3 (Only due to issues of FF decompilation inconsistancies) Common: 910 Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.	2012-08-08 05:48:06 -07:00