Changeset 9389881

Timestamp:
10/28/14 13:38:05 (2 months ago)
Author:
Kris Moore <kris@…>
Branches:
releng/10.1
Children:
2ff6fd6
Parents:
f63c5c8 (diff), 6b2e3f1 (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 branch 'master' of github.com:pcbsd/pcbsd into releng/10.1

Conflicts:

src-qt4/pc-systemupdatertray/TrayUI.cpp

Files:
1 added
12 edited

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