Commit graph

8 commits

Author SHA1 Message Date
Cameron Gutman
753f07c723 [USB-BRINGUP-TRUNK]
- Merge 54115-54859

svn path=/branches/usb-bringup-trunk/; revision=55020
2012-01-20 21:19:37 +00:00
Cameron Gutman
c2d0d784c7 [USB-BRINGUP-TRUNK]
- Create a branch to do a proper merge of USB work from a trunk base instead of from cmake-bringup
- In the future, DO NOT under any circumstances branch another branch. This leads to merge problems!

svn path=/branches/usb-bringup-trunk/; revision=55018
2012-01-20 20:58:46 +00:00
Amine Khaldi
46a8da69da [CMAKE]
* Sync with trunk r51323.

svn path=/branches/cmake-bringup/; revision=51329
2011-04-13 08:39:17 +00:00
Amine Khaldi
475719f162 [CMAKE]
- Sync with trunk r51165.

svn path=/branches/cmake-bringup/; revision=51166
2011-03-26 23:14:25 +00:00
Amine Khaldi
6c0c23cb53 [CMAKE]
- Sync with trunk head (r50270)
- This also reverts r49298.

svn path=/branches/cmake-bringup/; revision=50271
2011-01-03 00:33:31 +00:00
Timo Kreuzer
406dfdbc87 [CMAKE]
Sync trunk (rr49606)

svn path=/branches/cmake-bringup/; revision=49607
2010-11-16 13:43:39 +00:00
Timo Kreuzer
912ce51ae6 [CMAKE]
Sync with trunk head (r48826)

svn path=/branches/cmake-bringup/; revision=48831
2010-09-20 17:27:52 +00:00
Amine Khaldi
c424146e2c Create a branch for cmake bringup.
svn path=/branches/cmake-bringup/; revision=48236
2010-07-24 18:52:44 +00:00