]> xenbits.xen.org Git - xenclient/build.git/commit
Merge branch 'master' of git://git.uk.xensource.com/xenclient/build
authorJake Wires <Jake.Wires@citrix.com>
Tue, 20 Oct 2009 23:26:40 +0000 (16:26 -0700)
committerJake Wires <Jake.Wires@citrix.com>
Tue, 20 Oct 2009 23:26:40 +0000 (16:26 -0700)
commitc36b8fab67a14a61563785afc40dd3b7fa187be8
treee8db4eba707e02e6bfe578c54eea1299c4c6faa1
parentef2a690bfbfed41c5956cd38fcdfb4333dea00dd
parenta875f16bd6da03ef2c0e706134cfd48436c58f63
Merge branch 'master' of git://git.uk.xensource.com/xenclient/build

Conflicts:
package/xenclient/Config.in
package/xenclient/xenclient.mk
package/xenclient/Config.in
package/xenclient/xenclient.mk