summaryrefslogtreecommitdiffstats
path: root/etc
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'jim-p2011-07-1241-1297/+1327
|\
| * Create dynamodules in the order they where touchedScott Ullrich2011-07-121-1/+1
| * Do a more strict check on this to avoid warningsErmal2011-07-121-1/+1
| * Allow DHCP mappings to be resolved first for reverse lookups.Andrew Thompson2011-07-121-3/+10
| * Enable the pfsync checking unconditionallyErmal2011-07-111-10/+8
| * Actually give pfsync time to catch up.Ermal2011-07-111-0/+2
| * If the sync has not finished do not start carp yetErmal2011-07-111-0/+11
| * Fix gettextVinicius Coque2011-07-111-2/+2
| * Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-07-111-1/+1
| |\
| | * Fixes #1666. For OpenVPN interfaces always check if part of bridge or not.Ermal2011-07-111-1/+1
| * | Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-07-113-1/+2
| |\ \ | | |/
| | * fix textChris Buechler2011-07-091-1/+1
| | * Ticket #1564. Give +x to the script so it can be executed. Simple hah :)Ermal2011-07-081-0/+0
| * | Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-07-073-23/+59
| |\ \
| * | | Implement gettextVinicius Coque2011-07-061-136/+128
| * | | Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-07-0615-359/+468
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-06-2813-259/+415
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-06-2017-101/+476
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-06-0722-242/+405
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-255-64/+92
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-2322-91/+319
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-05-2318-130/+219
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-04-1513-32/+73
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-04-046-22/+58
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-315-27/+35
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-298-118/+191
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-2519-107/+217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/master' into incVinicius Coque2011-03-2536-342/+930
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | BP: fix syntax error on gettext implementationVinicius Coque2011-02-111-1/+1
| * | | | | | | | | | | | | | | | BP: Fix gettext implementationVinicius Coque2011-02-082-2/+2
| * | | | | | | | | | | | | | | | Merge branch 'master' into incVinicius Coque2011-01-2857-969/+2690
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incVinicius Coque2010-12-1437-690/+1199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Fix gettext in priv.defs.incVinicius Coque2010-12-021-2/+2
| * | | | | | | | | | | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-11-171-111/+143
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-161-6/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-1627-182/+298
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-097-13/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-11-0318-195/+350
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-184-30/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Fix typoRenato Botelho2010-10-151-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-10-152-80/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-135-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-118-18/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-10-057-25/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | More gettext fixesRenato Botelho2010-10-015-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix quotes to use %N$X on gettext callsRenato Botelho2010-10-0122-67/+67
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote branch 'mainline/master' into incRenato Botelho2010-10-016-40/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-09-2817-57/+286
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'mainline/master' into incRenato Botelho2010-09-168-155/+131
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
OpenPOWER on IntegriCloud