Summary of changes:
7b49a5c... robotics: add pcl-devel to default packages (*) a3302bb... Merge branch 'master' into f17 (*) 4f68698... Revert "robotics: add pcl-devel to default packages" (*) dcce713... robotics: add pcl-devel to default packages (*) 821fa0f... specspo is no longer in repo, so stop excluding it (*) 0f1ceca... wormux has been renamed warmux (*) 398fef3... Games: Still oversize so drop FlightGear (*) f1ed2cf... fedora-livecd-kde.ks: Remove the commented out -konq-plugin (*) b87c0bb... fedora-live-kde.ks: Update list of kdeedu apps. (*) 3cc088b... fedora-livecd-kde.ks: Readd amarok and update comment. (*) 59118f7... fedora-livecd-kde.ks: Don't explicitly blacklist kdeedu*. (*) 8a879a6... kde: s/koffice/calligra/ (*) 83a5d2d... Scientific spin: include SAGE, python-pp and some meta-data (*) a1fb14d... Merge branch 'f17'
(*) This commit already existed in another branch; no separate mail sent
On Sat, Mar 10, 2012 at 12:55:43 +0000, Amit Saha amitksaha@fedoraproject.org wrote:
Summary of changes:
You don't want to be merging between the f17 and master branches. Master is going to be diverging soon and some commits may not be appropriate for both. Use cherry-pick to bring commits from one branch to the other.
On Sun, Mar 11, 2012 at 2:47 AM, Bruno Wolff III bruno@wolff.to wrote:
On Sat, Mar 10, 2012 at 12:55:43 +0000, Amit Saha amitksaha@fedoraproject.org wrote:
Summary of changes:
You don't want to be merging between the f17 and master branches. Master is going to be diverging soon and some commits may not be appropriate for both. Use cherry-pick to bring commits from one branch to the other.
Sorry. I shall keep that in mind for the next time.
Best, Amit
-
Amit Saha -
Bruno Wolff III