aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2013-08-12Merge "Include strings.h for the defintion of ffs()"tools_r22.2jp abgrall
2012-11-27am 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 Abgrall
2012-11-26ignore 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 Abgrall
2012-11-22Include strings.h for the defintion of ffs()Kevin Schoedel
2012-11-13Merge "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 Abgrall
2012-11-12ignore SIGPIPESJP Abgrall
2012-04-04Modify 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 Sharma
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood
2011-10-28keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl
2011-10-26undo reset to ics-mr1 until we have a better methodEd Heyl
2011-10-26reset to ics-mr1, but keep historyEd Heyl
2011-07-30am 3b2deb17: Reconcile with honeycomb-LTE-releaseandroid-4.0.4-aah_r1ics-aah-releaseThe Android Open Source Project
2011-07-30Reconcile 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 Project
2011-07-29Remove the debug tag.android-3.2.4_r1android-3.2.2_r2android-3.2.2_r1honeycomb-LTE-releaseYing Wang
2011-07-29am bcc59b4a: am d184710e: Remove the debug tag.Ying Wang
2011-07-29am d184710e: Remove the debug tag.Ying Wang
2011-07-29Remove the debug tag.Ying Wang
2011-07-27am b7ef9951: (-s ours) am e37d45ce: (-s ours) DO NOT MERGE: updating iptables...JP Abgrall
2011-07-27am e37d45ce: (-s ours) DO NOT MERGE: updating iptables to v1.4.11++ from masterJP Abgrall
2011-07-26DO NOT MERGE: updating iptables to v1.4.11++ from masterJP Abgrall
2011-07-11Remove the simulator target from all makefiles.Jeff Brown
2011-06-29quota2: fix inversion handling for --quotaJP Abgrall
2011-06-27Merge remote branch 'remotes/goog/v1_4' into merge_v1_4_quota2JP Abgrall
2011-06-24xt_quota2: fixup so that it works with iptablesJP Abgrall
2011-06-24Adding the original quota2 from xtables-addonsJP Abgrall
2011-06-13Merge remote branch 'goog/v1_4' into merge_v1.4.11_into_masterJP Abgrall
2011-06-10Post-merge fixup. Add new Android.mk, re-checkin generated filesJP Abgrall
2011-06-10Merge git://git.netfilter.org/iptables into v1.4.11_upstreamJP Abgrall
2011-06-08Bump version to 1.4.11.1Patrick McHardy
2011-06-08doc: fix MASQUERADE section of man pageVlad Dogaru
2011-06-08build: re-add missing CPPFLAGS for libiptcJan Engelhardt
2011-06-07option: fix ignored negation before implicit extension loadingJan Engelhardt
2011-06-07tests: add some sample rulesets to test save-restore cycleJan Engelhardt
2011-06-07src: move all iptables pieces into a separate directoryJan Engelhardt
2011-06-07src: move all libiptc pieces into its directoryJan Engelhardt
2011-06-07xtables-multi: fix absence of xml translator in IPv6-only buildsMaciej Żenczykowski
2011-06-02android build: support lack of __ANDROID__ in older toolchainsJP Abgrall
2011-06-01doc: fix trivial typo in libipt_SNATElie De Brauwer
2011-06-01build: move remaining preprocessor flags to CPPFLAGSMike Frysinger
2011-06-01build: move kinclude's preprocessor flags to kinclude_CPPFLAGSJan Engelhardt
2011-06-01build: move basic preprocessor flags to regular_CPPFLAGSJan Engelhardt
2011-05-31Merge iptables 1.4 onto master (do-over)Jean-Baptiste Queru
2011-05-30doc: iptables-xml should be in manpage section 1Jan Engelhardt
2011-05-30doc: update GPL license textJan Engelhardt
2011-05-30build: fix absence of xml translator in IPv6-only buildsJan Engelhardt
2011-05-30build: fix installation of symlinksJan Engelhardt
2011-05-30build: remove dead code partsJan Engelhardt
2011-05-29libxt_owner: restore inversion supportJan Engelhardt
2011-05-26Bump version to 1.4.11Patrick McHardy
2011-05-25Merge branch 'master' of git://dev.medozas.de/iptablesPatrick McHardy