aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/ext...cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56cm-10.2.1cm-10.2.0cm-10.2-M1stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0stable/cm-10.2shipping/cm-11.0cm-11.0cm-10.2Steve Kondik2013-09-190-0/+0
|\
| * am 42ea6673: ignore SIGPIPESJP Abgrall2012-11-270-0/+0
| |\
* | | Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-240-0/+0
|\| |
| * | Merge "ignore SIGPIPES"JP Abgrall2012-11-131-0/+3
| |\ \
| | * | ignore SIGPIPESJP Abgrall2012-11-121-0/+3
| |/ /
* | | Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/ext...cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingcm-10.1Steve Kondik2013-02-121-0/+3
|\ \ \ | |/ / |/| / | |/
| * ignore SIGPIPESJP Abgrall2012-11-261-0/+3
|/
* Modify iptables to talk to xt_IDLETIMER version 1.cm-10.1-M1jellybean-stablejellybeanAshish Sharma2012-04-043-1/+20
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
|/|
| * undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-260-0/+0
| |\
| | * reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| |/| |/|/
| * am 3b2deb17: Reconcile with honeycomb-LTE-releaseThe Android Open Source Project2011-07-300-0/+0
| |\ | |/ |/|
* | Reconcile with honeycomb-LTE-releaseThe Android Open Source Project2011-07-300-0/+0
|\ \
| * | Remove the debug tag.Ying Wang2011-07-291-6/+2
| | * am bcc59b4a: am d184710e: Remove the debug tag.Ying Wang2011-07-291-6/+2
| | |\ | |_|/ |/| |
* | | am d184710e: Remove the debug tag.Ying Wang2011-07-291-6/+2
|\ \ \
| * | | Remove the debug tag.Ying Wang2011-07-291-6/+2
| |/ /
| | * am b7ef9951: (-s ours) am e37d45ce: (-s ours) DO NOT MERGE: updating iptables...JP Abgrall2011-07-270-0/+0
| | |\ | |_|/ |/| |
* | | am e37d45ce: (-s ours) DO NOT MERGE: updating iptables to v1.4.11++ from masterJP Abgrall2011-07-270-0/+0
|\| | | |/ |/|
| * DO NOT MERGE: updating iptables to v1.4.11++ from masterJP Abgrall2011-07-26549-28888/+34230
* | Remove the simulator target from all makefiles.Jeff Brown2011-07-111-9/+1
* | quota2: fix inversion handling for --quotaJP Abgrall2011-06-291-0/+2
* | Merge remote branch 'remotes/goog/v1_4' into merge_v1_4_quota2JP Abgrall2011-06-273-0/+201
|\ \
| * | xt_quota2: fixup so that it works with iptablesJP Abgrall2011-06-241-51/+37
| * | Adding the original quota2 from xtables-addonsJP Abgrall2011-06-243-0/+215
* | | Merge remote branch 'goog/v1_4' into merge_v1.4.11_into_masterJP Abgrall2011-06-1381-1052/+1280
|\| |
| * | Post-merge fixup. Add new Android.mk, re-checkin generated filesJP Abgrall2011-06-106-369/+352
| * | Merge git://git.netfilter.org/iptables into v1.4.11_upstreamJP Abgrall2011-06-1075-683/+928
|/| |
| * | Bump version to 1.4.11.1Patrick McHardy2011-06-081-1/+1
| * | doc: fix MASQUERADE section of man pageVlad Dogaru2011-06-081-1/+1
| * | build: re-add missing CPPFLAGS for libiptcJan Engelhardt2011-06-081-0/+3
| * | option: fix ignored negation before implicit extension loadingJan Engelhardt2011-06-075-8/+20
| * | tests: add some sample rulesets to test save-restore cycleJan Engelhardt2011-06-072-0/+222
| * | src: move all iptables pieces into a separate directoryJan Engelhardt2011-06-0733-81/+84
| * | src: move all libiptc pieces into its directoryJan Engelhardt2011-06-076-17/+18
| * | xtables-multi: fix absence of xml translator in IPv6-only buildsMaciej Żenczykowski2011-06-075-7/+14
| * | doc: fix trivial typo in libipt_SNATElie De Brauwer2011-06-011-1/+1
| * | build: move remaining preprocessor flags to CPPFLAGSMike Frysinger2011-06-014-8/+8
| * | build: move kinclude's preprocessor flags to kinclude_CPPFLAGSJan Engelhardt2011-06-013-9/+9
| * | build: move basic preprocessor flags to regular_CPPFLAGSJan Engelhardt2011-06-015-7/+14
| * | doc: iptables-xml should be in manpage section 1Jan Engelhardt2011-05-302-1/+1
| * | doc: update GPL license textJan Engelhardt2011-05-301-21/+21
| * | build: fix absence of xml translator in IPv6-only buildsJan Engelhardt2011-05-301-2/+2
| * | build: fix installation of symlinksJan Engelhardt2011-05-301-3/+3
| * | build: remove dead code partsJan Engelhardt2011-05-303-10/+2
| * | libxt_owner: restore inversion supportJan Engelhardt2011-05-291-2/+4
| * | Bump version to 1.4.11Patrick McHardy2011-05-261-1/+1
| * | Merge branch 'master' of git://dev.medozas.de/iptablesPatrick McHardy2011-05-2524-292/+348
| |\ \
| | * | libxt_time: deprecate --localtz option, document kernel TZ caveatsJan Engelhardt2011-05-252-18/+45
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 09:29:41 +0000