Ignore:
Timestamp:
Apr 16, 2013 12:03:55 PM (15 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.1-release, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
76557842
Parents:
470af24a (diff), 1620346 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'pcbsd/master'

Conflicts:

README.md
src-qt4/EasyPBI/i18n/EasyPBI_et.ts
src-qt4/about-gui/i18n/AboutGui_et.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_af.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ar.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_az.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_bg.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_bn.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_bs.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ca.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_cs.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_cy.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_da.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_de.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_el.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_en_GB.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_en_ZA.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_es.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_et.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_eu.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_fa.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_fi.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_fr.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_fr_CA.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_fur.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_gl.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_he.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_hi.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_hr.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_hu.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_id.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_is.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_it.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ja.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ka.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ko.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_lt.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_lv.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_mk.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_mn.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ms.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_mt.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_nb.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ne.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_nl.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_pa.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_pl.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_pt.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_pt_BR.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ro.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ru.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_sk.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_sl.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_sr.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_sv.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_sw.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_ta.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_tg.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_th.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_tr.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_uk.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_uz.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_vi.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_CN.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_HK.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_zh_TW.ts
src-qt4/libpcbsd/ui/i18n/libpcbsd_zu.ts
src-qt4/pc-installgui/i18n/SysInstaller_et.ts
src-qt4/pc-mounttray/i18n/MountTray_et.ts
src-qt4/pc-netmanager/src/NetworkManager/i18n/NetworkManager_et.ts
src-qt4/pc-updategui/i18n/UpdateGui_et.ts
src-sh/port-files/Makefile

File:
1 edited

Legend:

Unmodified
Added
Removed
Note: See TracChangeset for help on using the changeset viewer.