| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'upstream/master' into print-bracket-fix | Jim Shaver | 2015-05-31 | 1 | -3/+4 |
| |\ | | | | | | | | | | | | | | | Conflicts: examples/har_extractor.py examples/nonblocking.py examples/read_dumpfile libmproxy/web/app.py | ||||
| | * | Add coding style check, reformat. | Aldo Cortesi | 2015-05-30 | 1 | -2/+3 |
| | | | |||||
| * | | Fixed print function to be inline with python 3 | Jim Shaver | 2015-05-29 | 1 | -2/+2 |
| |/ | |||||
| * | Clean up and clarify StateObject | Aldo Cortesi | 2014-09-17 | 1 | -2/+2 |
| | | | | | | | | | | - Flatten the class hierarchy - get_state, load_state, from_state are public - Simplify code - Remove __eq__ and __neq__. This fundamentally changes the semantics of inherited objects in a way that's not part of the core function of the class | ||||
| * | update examples, fix #353 | Maximilian Hils | 2014-09-08 | 1 | -5/+6 |
| | | |||||
| * | fix #253 | Maximilian Hils | 2014-05-15 | 1 | -0/+17 |
