Lunny Xiao 14ba638eb8 Merge branch 'dev' of github.com:go-xorm/xorm into dev ... Conflicts: docs/QuickStart.md docs/QuickStartEn.md examples/cache.go examples/maxconnect.go		2014-04-17 17:21:29 +08:00
..
cache.go	tidy up example codes	2014-04-17 17:08:21 +08:00
cachegoroutine.go	bug fixed	2014-04-17 10:13:16 +08:00
conversion.go	renamed import path	2014-04-11 17:16:43 +08:00
derive.go	renamed import path	2014-04-11 17:16:43 +08:00
goroutine.go	renamed import path	2014-04-11 17:16:43 +08:00
maxconnect.go	Merge branch 'dev' of github.com:go-xorm/xorm into dev	2014-04-17 17:21:29 +08:00
singlemapping.go	renamed import path	2014-04-11 17:16:43 +08:00
sync.go	bug fixed	2014-04-17 10:13:16 +08:00