]> xenbits.xen.org Git - xenclient/build.git/commit
Merge branch 'master' of git://git.xci-test.com/xenclient/build
authorJean Guyader <jean.guyader@eu.citrix.com>
Wed, 27 Jan 2010 11:08:44 +0000 (11:08 +0000)
committerJean Guyader <jean.guyader@eu.citrix.com>
Wed, 27 Jan 2010 11:08:44 +0000 (11:08 +0000)
commit2b47037e30d17cb2bf0a37a293b97a071f0bfeb6
tree0c7ebe07fc951eaa3a5771324155cd2825964459
parent25f459b7b2d487743b48db3d3075c398eca3fde7
parentc47e68fad0e88b2b79f41508bbab7d7a07a67a95
Merge branch 'master' of git://git.xci-test.com/xenclient/build

Conflicts:
package/xenclient/ioemu/ioemu.mk
package/xenclient/ioemu/ioemu.mk