aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 42ea6673: ignore SIGPIPESandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r1android-4.4w_r1android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1android-4.3_r3.1android-4.3_r3android-4.3.1_r1tools_r22kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-devjb-mr2.0.0-releasejb-mr2-devjb-mr1.1-dev-plus-aospJP Abgrall2012-11-270-0/+0
|\
| * ignore SIGPIPESandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releasejb-mr1.1-devJP Abgrall2012-11-261-0/+3
* | Merge "ignore SIGPIPES"android-cts-4.4_r4android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9kitkat-releasekitkat-cts-releasejb-mr2.0-releasejb-mr2-releasejb-mr1-dev-plus-aospJP Abgrall2012-11-131-0/+3
|\ \ | |/ |/|
| * ignore SIGPIPESJP Abgrall2012-11-121-0/+3
|/
* Modify iptables to talk to xt_IDLETIMER version 1.android-sdk-support_r11android-cts-4.2_r1android-cts-4.1_r4android-cts-4.1_r2android-cts-4.1_r1android-4.2_r1android-4.2_pre3android-4.2_pre2.2android-4.2_pre2.1android-4.2_pre2android-4.2_pre1.1android-4.2_pre1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1android-4.1_pre2android-4.1_pre1android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1android-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1android-4.1-sdk_pre1tools_r21jb-releasejb-mr1-releasejb-mr1-factory-releasejb-mr1-devjb-mr0-releasejb-devics-plus-aospAshish 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-releaseandroid-4.0.4-aah_r1ics-aah-releaseThe Android Open Source Project2011-07-300-0/+0
| |\ | |/ |/|
* | Reconcile with honeycomb-LTE-releaseandroid-sdk-adt_r20android-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1android-3.2.6_r1tools_r20ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-releaseThe Android Open Source Project2011-07-300-0/+0
|\ \
| * | Remove the debug tag.android-3.2.4_r1android-3.2.2_r2android-3.2.2_r1honeycomb-LTE-releaseYing 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
| | * | libxt_time: --utc and --localtz are mutually exclusiveJan Engelhardt2011-05-251-2/+6
| | * | libxt_time: always ignore libc timezoneJan Engelhardt2011-05-251-1/+7
| | * | libxt_NFQUEUE: add mutual exclusion between qnum and qbalJan Engelhardt2011-05-251-2/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 18:07:11 +0000