| Comment: | Merge branch 'master' into runtime
* master: (6 commits) |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | runtime |
| Files: | files | file ages | folders |
| SHA3-256: |
19a677b5965ad86297e4688ab892af50 |
| User & Date: | js on 2012-06-11 20:50:09 |
| Other Links: | branch diff | manifest | tags |
|
2012-06-11
| ||
| 21:01 | Fix a warning due to uint_fast16_t > uint32_t. check-in: e4832ae80b user: js tags: runtime | |
| 20:50 | Merge branch 'master' into runtime check-in: 19a677b596 user: js tags: runtime | |
| 11:08 | Improve -[OFNumber description]. check-in: 0db281bf03 user: js tags: trunk | |
|
2012-06-06
| ||
| 14:05 | Merge branch 'master' into runtime check-in: 050ac82798 user: js tags: runtime | |
Modified ObjFW.xcodeproj/project.pbxproj from [0481245247] to [f8de28e17c]. [diff]
Modified src/OFArray.h from [bde628b396] to [01516d5008]. [diff]
Modified src/OFArray.m from [5ae87127d9] to [7b45e24981]. [diff]
Modified src/OFAutoreleasePool.m from [bc3a0d2a2f] to [42c4c969f4]. [diff]
Modified src/OFBlock.m from [36beda4104] to [d9ed74f314]. [diff]
Modified src/OFConstantString.m from [e6c815e41d] to [63e98f3fd3]. [diff]
Modified src/OFDataArray.m from [1c8a76eb56] to [a3f3ece2b2]. [diff]
Modified src/OFDictionary.m from [170550a25e] to [d6efe13c19]. [diff]
Modified src/OFDictionary_hashtable.m from [c77b46c66d] to [81e5d7fd45]. [diff]
Modified src/OFFile.m from [69833cd0ab] to [be7cb0fa5d]. [diff]
Modified src/OFHTTPRequest.m from [456aec5d03] to [bba59f52c5]. [diff]
Modified src/OFMutableArray.h from [cef5851cfb] to [9c7f745e9f]. [diff]
Modified src/OFMutableArray.m from [2fdb683912] to [0bfaa52216]. [diff]
Modified src/OFMutableArray_adjacent.m from [489af893ca] to [e388818b36]. [diff]
Modified src/OFMutableDictionary_hashtable.m from [959d2e2496] to [aeb921a44b]. [diff]
Modified src/OFMutableSet.m from [f111a1faac] to [ae4b0f4644]. [diff]
Modified src/OFMutableString_UTF8.m from [3f21e1777e] to [ccd236b694]. [diff]
Modified src/OFNumber.m from [f581497f4f] to [3bd254e0cf]. [diff]
Modified src/OFObject.h from [2f8f69a869] to [f1d13468c6]. [diff]
Modified src/OFObject.m from [71be745647] to [f73166965d]. [diff]
Modified src/OFProcess.m from [6f88407ce3] to [8d0f0fd4b4]. [diff]
Modified src/OFStream.h from [5cd3180445] to [aea1f2dd6e]. [diff]
Modified src/OFStream.m from [a84cb06e69] to [6e083ee3de]. [diff]
Modified src/OFStreamObserver.m from [75b0a6497b] to [aaaee883eb]. [diff]
Modified src/OFStreamSocket.m from [acbc1571b5] to [57d59bfcb8]. [diff]
Modified src/OFString+JSONValue.m from [06182df9e0] to [291a080964]. [diff]
Modified src/OFString.m from [788fd6f59d] to [a987125a46]. [diff]
Modified src/OFString_UTF8.m from [5faa6d539b] to [65dd22d751]. [diff]
Modified src/OFTCPSocket+SOCKS5.m from [fa4c8cce5e] to [a16701d00f]. [diff]
Modified src/OFXMLElement.m from [23e15b2038] to [dff10de86f]. [diff]
Modified src/OFXMLParser.h from [6be0e684f3] to [81cc682f41]. [diff]
Modified src/OFXMLParser.m from [2619682154] to [a3d968177a]. [diff]
Modified src/ObjFW.h from [951501aebd] to [d4c97a2a17]. [diff]
Modified src/exceptions/Makefile from [7c2fda7df6] to [9c19595da9]. [diff]
Added src/exceptions/OFInvalidJSONException.h version [28abef2a60].
Added src/exceptions/OFInvalidJSONException.m version [ca1d0c629a].
Modified tests/OFJSONTests.m from [ae9d04304d] to [c4b49139b1]. [diff]
Modified tests/OFMD5HashTests.m from [dbff846819] to [3d9bebb920]. [diff]
Modified tests/OFObjectTests.m from [4509cfc31c] to [dd072d17db]. [diff]
Modified tests/OFSHA1HashTests.m from [73080758bd] to [1cad042110]. [diff]
Modified tests/OFStreamTests.m from [25c328e52e] to [cf598bf19b]. [diff]
Modified tests/OFTCPSocketTests.m from [3905bc918e] to [090030e624]. [diff]
Modified tests/OFXMLParserTests.m from [56d6347fce] to [c34c13b545]. [diff]