labofsahil/github-event-dataset-2012 huggingface dataset:
Hosele nadaram begam chi karayi kardam
khodtoon niga konin dige, age gharar bashe man hey benevisam ke dige nashod ...
[Add] Move/scale the cube as you please.
Reasoning behind sanitized key vs user meta key when accessing data
Adding additional filters to readme
[fix] updated github buttons (iframe issue)
Some AuthResponse changes.
Implement GET /statuses/mention.json
Similar to home_timeline and user_timeline

looks like it might be good to extract out preparing the json

this commit should satisfy  #572
Core/Player:
* Fixed crash in player loading/save.
* Fixed crash if u create a guild.
DB/Base: Update sql with recent updates.
DB/spell_script_names Fix error consol

Error: Scriptname:`xxxxxx` spell (spell_id:xxxxxx) does not exist in `Spell.dbc`.

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
cambiato ruby da c: a e:
Added type to register player
Change-Id: Iba24c87f327a163162d09adc59dda7116d9c57b4
formatting
Better exception init
-Much better error handling
-Resizable messageboxes
-Better styles
Remove maximum-scale restriction.
Tidied out some other unused/copied rake functions that I don't need.
tests passed
Merge branch 'master' of github.com:Bridgit/Bridgit
container css bigger
wfreerdp-server: small packaging patch
Fixed a problem with organ name display.

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4728 316c924e-a436-60f5-8080-3fe189b3f50e
Merge branch 'cib' of github.com:CIB/tgstation13 into cib

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4729 316c924e-a436-60f5-8080-3fe189b3f50e
Merge branch 'cib' of github.com:CIB/tgstation13 into cib

git-svn-id: https://tgstation13.googlecode.com/svn/trunk@4730 316c924e-a436-60f5-8080-3fe189b3f50e
modified assembler to make testbench
Errors Fixed Lab One Complete
warn on error when user display javascript
Fix swapped template values in build_standalone_runner.rb.

`example_source_tags` and `example_spec_tags` each returned what the other
should have returned. I noticed this bug because it made the comments in
SpecRunner.html about where to include spec and source files incongruous with
the example tags that followed.
added lbrx::write_eth_control AND lbrx::read_eth_control
A new.version with fancy new features!

* JRSwizzle is optional.
* You can use defines to activate just a subset of the alternate
  printers.
* You can still swizzle out if you like. (Swizzling has been changed
  to a c-style function call instead of munging up NSObject).
* Support for NSOrderedSet has been added.
Weird behavior when adding to project with '/*.{h|m}' on source_files, rolling back to older version.
Update MTLocation spec to include resource files
Add SPTabBarController spec
Fix wrong repository URL
Fixed source_files
removed duplicated podspec for MagicalRecord 2.0

[#206]
Merge remote-tracking branch 'origin/master' into 0.6
updated MagicalRecord for use with the latest cocoapods version
- add pod spec for minor update 0.1.0
- add pod spec for BDMultiDownloader
- add clean paths to BDToastAlert
disable iOS specific spec. modify description.
add clean paths and summary
add clean paths, new description.
add spec for BDDynamicGridViewController 0.0.2
remove the deprecated clean_paths param
fix summary should end with a dot.
Merge pull request #240 from norsez/master

BDToastAlert Podspec 0.1.0 is Added
Merge pull request #93 from ObjColumnist/master

Added MCMKeychainItem Podspec
Added LARSAdController and GoogleAds podspecs.
Fixed LARSAdController spec validation.
Removed new GoogleAds podspec - found AdMob pod has already been added. Changed LARSAdController to link against AdMob pod instead.
Merge branch 'master' of https://github.com/CocoaPods/Specs
Added LARSAdController 2.1.1. Added AdMob 6.0.3.
Renamed 2.1.0 folder to 2.1.1 since that's the real version.
Added library to preserve path.
Removed 2.1.0 folder. Changed library path on admob to POD_ROOT
Trying to get build path correct.
Added .m file to source_files
Reverted library search path espcaping quotations.
Changed source link to https from git:
Merge pull request #294 from larsacus/master

Add pod for LARSAdController + working dependency for AdMob
[Rakefile] Strict lint for new podspecs.
背包 外加本地化
Fixed urleditor bug with system pages access by ID and Handy preset.
v6
'
added an initial makefile, only working debug option for now
Thay đổi màu nền trong pop-up trên bản đồ.
FiX send correo with ut8 encode title
commit JSON
Fix to config file parsing with empty sections
fixed readme typo
fixed path issue with / in artists name/song title
implemented ffmpeg on the fly encoding
General changes - UXvertex, UXdraw, UXcode.
màj des param de connexion CF JN
lotko json update at Dec 27, 2012 8:06:38 AM
lotko json update at Jun 17, 2012 8:36:50 PM
lotko json update at Jun 3, 2012 8:11:41 PM
Poppler: Update to 0.18.2
GiNaC 1.6.2

Closes #8979.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
emacs: update references to git mirror

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
node: Add comment explaining why --without-npm

Users looking at the formula don't know why we are not installing npm.
Add a comment pointing to the original discussion.

Closes #8989.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
zookeeper 3.3.4

Closes #8982.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
stunnel: use stable archive URLs

By pointing to the archive folder, the download link remains valid even
though future releases are issued

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
scsh: Build 32-bit

scsh fails to build for 64-bit with gcc-4.2, llvm-gcc and clang, but
builds fine for a 32-bit target with any of them.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Updated stunnel to 4.50
gource 0.37

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
ec2-api-tools 1.5.0.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
opencc 0.3.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
elasticsearch 0.18.5

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Introduce HOMEBREW_CURL_VERBOSE

When investigating issues, one might want to see exactly what curl is
doing behind the scenes. Setting HOMEBREW_CURL_VERBOSE will cause the
'--verbose' flag to be passed to all invocations of curl.

Prompted by #8992.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Ignore $HOME/.curlrc when invoking curl

Several issues have been caused by conflicts between the options
Homebrew passes to curl and those read from $HOME/.curlrc. Passing '-q'
will force curl to ignore settings in that file.

Suggested in #9027.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
glib: patch to use native iconv

Closes #6868.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
glib: builds with LLVM >= 2335

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
audit: check for hard-coded compilers

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Idioms
Added a coat of paint.
Userbox fragment added, implemented accross all relevant pages
fixed a bug which makes "device busy" at start
Ändrade namn på komponenter i gui.
Added gravy and chris to authors.
SEO friendly urls
trinity-base/kdeartwork-kscreensaver: fixed build with kscreensaver
local1 commit
libwinpr-registry: start implementation
added css to main page
Revert "some stuff to make lintian happy (unfinished)"

This reverts commit 56a415b5de06f4dc07d9fdbb2588b27f0f5d48f4.

its dumb to change it just because i can, since it works and i don't think i want to care right now.
* release 0.9.27 for debian
- add NEWS file for lenny
- correct Vcs-* for github
- better describe why we close bugs in changelogs, also fix a typo
First commit in new branch.
Made ContentHolder which has all the content in it, and some refatoring.
Added ScreenObjects class, that holds all the objects and loads them
Merge branch 'RefactorBranch' of https://github.com/Fumler/Immunity into RefactorBranch

Conflicts:
	immunity/immunity/immunity/model/Button.cs
Minor tweaks and fixes to get the game running again.
Minor fixes
Added ScreenObject.cs
Fixed a bug that prevented the program from running
Merge branch 'RefactorBranch'

Conflicts:
	immunity/immunity.sln.docstates.suo
	immunity/immunity/immunity/Game1.cs
Adding LESS and working on CSS
Added CakePHP templates to ack whitelist
Remapping Q and Qa to q/qa (I make this typo WAY too often)
Removed annoying automatic changing of directory on start
Simple html edits
del language
Merge pull request #1 from GianArb/master

language
Merge pull request #2 from GianArb/dev

Merge pull request #1 from GianArb/master
Merge pull request #3 from GianArb/master

language
Bug 680887 - Updated RELAX NG schema for trunk XML file format

Author: Baptiste Carvello <devel@baptiste-carvello.net>

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22515 57a11ea4-9604-0410-9ed3-97b8803252fd
Fix credit note duplication. It was not possible to duplicate a credit
note as an invoice (aka voiding a credit note).

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22211 57a11ea4-9604-0410-9ed3-97b8803252fd
interfaces: can: send nexthop MAC address in CFP header

This allows filtering on router nodes instead of using promisc mode.

Signed-off-by: Jeppe Ledet-Pedersen <jeppe@satlab.org>
Add missing breaks
add missing prebuild step for static lib if that is all you wish to build
correct typo (contrib) in prebuild step for 64 bit debug build.
Finalisation de l'autocompletion
adding things to services
adding things to services
Update README.md

Began to fill out the installation/setup section.
i dont need all this schmu from macosx when creating archives
updated database connection
updated database connection
new project
update database connection
deleting trash files from last project
remove files from last project
remove files from last project
Slight Changes in HTML files for color and stuff
-implemented debug connection
-started on thBase.logging
Link to RA1 manual instead of including it and update config tool
Fix for import of events when multi-category is enabled
Markdown fix

Markdown fix
First Prototype

First prototype has the intro page, contact page (non-working), and the
dashboard which so far only displays the two ports of entry into Los
Angeles.
created a menu with a <ul> element
Added convenience locations for /private/etc starting with l_private_etc. Kept support for l_etc locations to avoid breaking existing user Makefiles.
adding tweet at signup MOTHERFUCKER
thanks david ragone for twitter credentials
new file:   marshal.rb
	deleted:    marshaling.rb
	modified:   spec/marshal_spec.rb
'admin바뀜'
Load EM settings from menu

Load any em settings available
Gestion de la stoplist et des mots vides
Fixed problem that Severity unidentified is sent in the list of allSeverities
Merge branch 'development' of github.com:Jost4/HUSACCT-1 into development
Removed unused imports
extracted imports with a .*
Fix warning and build settings to build with Xcode4.2 on Snow Leopard
Pkg: automatically set origin URL if git config github.user is set
Small update to error message in docs
Merge pull request #1249 from staticfloat/master

Docs error message fixup
partially fix #1262
Update MOREEEE~

- Some Bug fixed
- Add String: description in models/Role.java
- Add First-Time Login Section~
add 62258.tmp
gaaet tilbage til singleThreading i den genetiske algoritme. Tilfoejet output om svaerhedsgrad
german - english
sys.out remove
fix for BZ 860702: show systems belonging to system groups and those not in any on 'Systems' screen
Merge pull request #750 from witlessbird/860702

fix for BZ 860702: both: systems belonging to system groups and not are being shown now on 'Systems' screen
license fix
Refactored exceptions [Assets]
Exceptions refactoring [Curl]
Exceptions refactoring [BootstrapRenderer]
fin for today
Update the install instructions to include those for xhprof.

Summary:
phabricator on toby is *sloooow*.  It may be that the machine is
overcommitted, but it's hard to tell without profiling.  This is the
profiling that we're supposed to install.  Instructions taken from
   http://www.phabricator.com/docs/phabricator/article/Installation_Guide.html

Reviewers: chris, benkomalo

Reviewed By: chris

Differential Revision: http://phabricator.khanacademy.org/D44
Raise the timeout on fetch_logs.sh

Summary:
It's taking more than an hour to fetch an hour's worth of logs,
sometimes.  It's not a problem to have the log-fetches overlap, so we
up the timeout.

We want to keep *some* timeout so hanging jobs don't stick around for
forever.

Make the timeout 120 min, not 180.

The load_emr.sh script runs at 2:30 AM UTC to access the prior day's
data. With a 3h timeout, it's possible that the final run (11pm-12am
UTC) might not be complete by the time that the log processing occurs,
which might make for a difficult to track down error.

Reviewers: chris

Reviewed By: chris

Differential Revision: http://phabricator.khanacademy.org/D879
Make ctags match cmake functions
Move the konix_xmacro script into the bin directory
Replace ~ in the fluxbox keys by $HOME
Addition of the konix/frame-configuration-top function
Addition of an emacs function to browse an url with uzbl
The f11 key is now a prefix command so that it may be used to bind custom keys like macros
Adapt the fluxbox keys to use xmacro instead of cnee to make X macros
update for include and detail in MenuItem view
corrected a mistake ^^
Update 3/0000/0442.txt
Merge pull request #692 from mafiox/patch-25

Update 3/0000/0442.txt
Removed text on line 30.
Completed. Manually Committed from ComplexRobot. https://github.com/Kyohack/B2W2eng/pull/172
One last word :P
Merge pull request #395 from PikalaxALT/patch-82

One last word :P
(fixed ü)
Added analytics just because
admin port
keystone config
added gitignore and better release config.
入库页面20%
tweaked fix.txt
updated header in README
added header to TODO
Really added header to TODO
fixed fix.txt
modified README
Added listen accept
updated admin email and other to mg-rast
Merge pull request #45 from paczian/master

updated default config to be mg-rast
[cleanup] Makefile: removed Makefile.private
started to improve build system
[doc] readme,changelog: added credits to bootstrat and font awesome
[enhance] bootstrap: upgraded to v2.0.2
[doc] changelog: compact
Last lap
Retard fixes, no crashes

Signed-off-by: Rikard Johansson <rillee.johansson@gmail.com>
Level 4 warnings fix
Fixed lein-emr specs in project.clj
Merge pull request #15 from MapofLife/feature/fix-lein-emr

Fixed lein-emr specs in project.clj
Hooks XPBank, a new XP economy plugin

Bukkit: http://dev.bukkit.org/server-mods/xpbank/
GitHub: https://github.com/Marenwynn/XPBank
Issue #43 - Clean-up multi-core BF.
Issue #43 - cleaning up MultiCoreBF.
2.0.6
merge
test 96
Added United States(Alabama, Alaska,Arizona, Arkansas, Colorado, Connecticut, Delaware,Florida,Georgia,Hawaii,Idaho,Illinois,Indiana,Iowa,Kansas) to foreca.com database
Release v0.0.3 and publish on npmjs

Signed-off-by: Emilien Kenler <hello@emilienkenler.com>
removed unused variable assignment, which caused MonoDevelop to error out on the build
Merge pull request #60 from bjorg/2.3

MonoDevelop build fix
Create a Visual Studio project to house code.
Add and create a file to store the entry function.
Setup 'WinMain' to create an apex window.
Create the needed layout for a rendering loop.

The code now in the project sets up a minimalistic framework that is
required to create a Direct3D 9 object and call a rendering function on
a loop.
Moved implementations into implementation namespaces
win methods, dealer hits method
adds OmniAuth login via github.com
quick hack for MoHW R-5
another base bamp
convert some prims to Scala

the motivation is that I want to eliminate the use of Java collections
in api.Let, in a commit coming soon
code improvement: make Let use Scala collection not Java
fix recent regression: ConcurrentModificationExceptions in agent.Realloc

I was only getting the actual exceptions on the scala-2.10 branch, but
the old code seems dodgy to me regardless of Scala version, so, changing
it on master
bin/issues.scala: 2.9.2 version of dispatch reboot beta2 now available
rename AgentSet.type method to AgentSet.kind

since type is a Scala keyword, and since I want to introduce a new
AgentKind type and not have it conflict with Syntax.AgentType
introduce AgentKind type and api.Agent.kind method

so we can phase out use of Class to track agent kinds
minor cleanup in HubNetManager
big refactoring: replace Class[_ <: Agent] with AgentKind
Merge remote-tracking branch 'origin/master' into core

Conflicts:
	bin/issues.scala
	extensions/gis
	extensions/network
	src/main/org/nlogo/agent/Importer.scala
	src/main/org/nlogo/agent/InRadiusOrCone3D.java
	src/main/org/nlogo/agent/LinkStamp3D.scala
	src/main/org/nlogo/agent/Torus3D.java
	src/main/org/nlogo/agent/TurtleStamp3D.scala
	src/main/org/nlogo/agent/World3D.java
	src/main/org/nlogo/app/AgentMonitor.scala
	src/main/org/nlogo/app/AgentMonitorEditor.scala
	src/main/org/nlogo/app/AgentMonitorManager.scala
	src/main/org/nlogo/app/AgentMonitorWindow.scala
	src/main/org/nlogo/app/App.scala
	src/main/org/nlogo/app/ProceduresTab.scala
	src/main/org/nlogo/app/ToolsMenu.scala
	src/main/org/nlogo/compiler/ConstantParser.scala
	src/main/org/nlogo/headless/HeadlessWorkspace.scala
	src/main/org/nlogo/hubnet/mirroring/LinkData.java
	src/main/org/nlogo/hubnet/mirroring/TurtleData.java
	src/main/org/nlogo/hubnet/server/HubNetManager.scala
	src/main/org/nlogo/lite/AppletPanel.scala
	src/main/org/nlogo/lite/LiteWorkspace.scala
	src/main/org/nlogo/lite/ProceduresLite.scala
	src/main/org/nlogo/prim/hubnet/_hubnetsendfollow.java
	src/main/org/nlogo/prim/hubnet/_hubnetsendoverride.scala
	src/main/org/nlogo/prim/hubnet/_hubnetsendwatch.java
	src/main/org/nlogo/prim/hubnet/primitives.scala
	src/main/org/nlogo/prim/threed/_breedat.scala
	src/main/org/nlogo/prim/threed/_turtlesat.scala
	src/main/org/nlogo/sdm/AggregateManagerLite.scala
	src/main/org/nlogo/sdm/gui/GUIAggregateManager.scala
	src/main/org/nlogo/window/ExternalFileInterface.java
	src/main/org/nlogo/window/GUIWorkspace.java
	src/test/org/nlogo/headless/AbstractTestLanguage.scala
	src/test/org/nlogo/headless/TestLanguage.scala
	src/test/org/nlogo/workspace/DummyAbstractWorkspace.scala
ongoing cleanup in StructureParser
@增加权限访问
	1）private成员，只有对象自身能访问和修改
	2）protected成员，可以被外部访问，但不能被修改
	3）public成员，即能被外部访问，也能被外部修改
@完善垃圾回收算(%50)
@完善垃圾回收算法（70％）
	垃圾算法是写codger这么久以来感觉最难的一部份，不能出一点儿错。今天因为块链表链接顺序错误，导致调试了5个小时才找到错识，真的有点怕了。
@完善垃圾回收算法(90%)
@添加基本数据类型浮点数
@实现绘图应用
	1)把codger作会一个脚本引擎，内置于绘图软件中
	2)绘图软件提贡绘画接口，画线，画点，设置颜色
	3)要绘制图形，只需要用codger编写即可
	4)绘图程序位于example/script_engine/draw
@增加模块的导入，以及数据的导出功能
@增加模块的统一管理功能，简化作为脚本引擎嵌入的软件其它软件代码的编写
@增加数组的成员函数
@增加内置对象
@增加第三方库math
@修复array_iter垃圾回收时更新出错
@完善应用example/script_engine/draw 软件
@增加字符串成员函数
@把host对象移入数据栈中
	以前遇到 a.push(b.get()) 这样的代码会重新host，造成不成正常运行
@修复垃圾回收算法中多次更新同一个对象时，造成的数据失效
	例如: a=GrGc_Update(a)
		  a=GrGc_Update(a)
	在以前这种会造成a被重复更新
@修复函数返回值异常，把返回值从EgThread中移到EgSframe上
@修复成员访问运算并赋值顺序
@完善垃圾回收算法
	1）增加根集注册以减少模块依赖性
	2) 修改根集
	3）修改GrClass_GrUpdate,更新c_instance_type->t_class
	4) 修改GrObject_GrUpdate，减少更新g_type->t_class
@写论文，这几天要安心写论文了，还有5天就要交了
@完成论文基本语句的简介
@修改drawscript
	1）采用树状控件来归类脚本
@为DrawScript增加几个分形图绘制脚本
@写论文
@论文(70%)
@论文(90%)
@论文(95%)
@codger
	1)修复扩展模块math.pow函数
@DrawScript
	1)增加julia,newton 这个分类
@增加类的继承
@修改makefile文件，使之更容易编译
1)把语言的名称改为codger
codger单词的本意为怪人,一个不错的单词在描述程序员, 而且codger和coder很相似.
2)支持下标[] 赋值
3)写了5个排序程序来（冒泡，插入，选择，堆)来测试codger，一切都工作很正常，结果也在意料之中，真的很高兴。这么久的努力终于没有白费啊
Bazinga! This is the final one
Updated READMEs with new code / doc locations
Replaced octovis stack.xml with new package.xml
addéd eval_octree_accuracy, small cleanup of CMakeLists
fixed octovis package.xml
Small cleanup of CMakeLists
.gitignore added
Shotgun sound in game.
Created reverse array and removed reload.
dispatcher not linking to cook pointlessly.
Fixing tests using ringout time.
unlinking to a dispatcher when d ungrabs.

This means the queue doesn't look through when it dies unless it really
needs to (ie: performance boost).
Setting a dispathcer to ungrab on grab_best message.

Modifications to cook for testability stuff.
Copy system plugins into the main bundle of the app.
Corrected OERatingCell behaviour toward data setting. Code cleaning.
Removed copy build phase for system plugins.
Merge branch 'master' of github.com:OpenEmu/OpenEmu

Conflicts:
	OpenEmu/OpenEmu.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:OpenEmu/OpenEmu

Conflicts:
	OpenEmu/OpenEmu.xcodeproj/project.pbxproj
Cut down unnecessary/harmful glFlush calls in Rice
Eliminate flickering in Mupen by using a second FBO for the core's rendering
Добавлен загрузчик с intuit.ru
Modified stripTags domTools function's allowedTag preparation regex.
Updated image resizing plugin's image resize button position
Added allowedAttributes option to paste addon. Used to determine which element attributes will not be stripped from pasted content.
Fixed issue where clicking a ul li item within markup or unclean markup paste tab content caused tab selection change.
Updated paste content handling.
Updated stripTags domTools function to ensure it finds self-closing tags.
Added img tag & src attribute to respective allowed arrays.
Updated allowedTags paste addon option.
Updated order of content cleaning.
Added allowedEmptyTags paste addon option. Modified stripEmpty to use it.
Updated stripTags function to more effectively find non-self closing & self-closing tags.
update to help message from Payette_mgr to show which models are installed
implemented non json pages
fixed mapping of path parts not available
Just run URLConnection on main thread
Send target attribute in audio ended event
No longer use wget for downloading the podcasts
Hit return instead of pressing any key
Adding spssMapping.xml file in order to create a spss file.

This xml file is going to guide the spss file generating. It contains
SPSS varNames and respective types. Each triagem form field is going to
be mapped as well.
Generating SPSS file with asked header.

TB.sav.zip file is being generated, according with the .sav file sent by
the medical group.

Content is not being loaded yet.
started HW5
changed our mind regarding a test case
Merge remote-tracking branch 'origin/master'
refactor: renamed method
ゴミ掃除
classファイルを無視する。
少し修正
基本システム完成
鉤縄実装中。RopeJoint使いたい。
bigdecimal
Merge remote-tracking branch 'umemura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/ItemManager.class
Merge remote-tracking branch 'kimura/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/Pause.class
Merge remote-tracking branch 'iwakawa/master'

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/BackgroundManager.class
	ScrollNinja/bin/org/genshin/scrollninja/EffectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyManager.class
	ScrollNinja/bin/org/genshin/scrollninja/FileOperation.class
	ScrollNinja/bin/org/genshin/scrollninja/GameMain.class
	ScrollNinja/bin/org/genshin/scrollninja/Interface.class
	ScrollNinja/bin/org/genshin/scrollninja/ItemManager.class
	ScrollNinja/bin/org/genshin/scrollninja/MainMenu.class
	ScrollNinja/bin/org/genshin/scrollninja/Pause.class
	ScrollNinja/bin/org/genshin/scrollninja/PlayerManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StageObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObject.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/WeaponManager.class
	ScrollNinja/src/org/genshin/scrollninja/object/weapon/Kaginawa.java
Fixed gr.get.pixel, gr.save and gr.screen.to_bitmap by GR.Rendering = true before calling GR.drawView.buildDrawingCache()
Fix screen lock issue when create DC failed.
Small commit. Not fixing anything.
Sort dates on chart
New Nuget package with JSON.NET Dependency
Fix crashes during refetch if objects were deleted. Expand managed object deletion support to handle nested objects. refs #1066
Properly shut down stdin

Replace hardcoded ints
Fix typos in ebdaf368e137fc933e648ee88a08a4f83e796f87
Fix broken RetrieveLastError()

- FORMAT_MESSAGE_IGNORE_INSERTS flag wasn't used and we never pass insertion parameters, this could cause FormatMessage() to fail
- The return value of FormatMessage() wasn't checked, if it returned zero (failure) then RetrieveLastError() returned garbage if err[] wasn't initialized previously
Fix thread handle leak in StartServiceThread()
Unbreak m_geoip
Halfway through ACL. Cekitout...
Dont call get_size
updated jqery ui to latest and modules css
[group by] Limited GROUP BY support was added
code formatting
#99 Nachbearbeitungszeitpunkt um Datum erweitern
seo
Project restarted
Change the width of page
basic 64 bit loading
Commited some binaries, whoops.
Updated to reflect x64 changes.
Some issues with directory names on Windows...
Protection against kernels > 512 pages - NI error thrown
Working on the PMM
fixed up makefile
Loader: Check if any module is specified.
General: Added ~ files to .gitignore
Loader: Fixed indentation/
Kernel: Using x86_64-pc-elf target now.
Kernel: Oops, forgot to un-debug Makefile.
Loader: Kernel entry point now @FF001000? wtf? I need to fix this shit some day...
Loader: Entry point from ELF file now used in long jmp to 64-bit.
General: Added .gch files to .gitignore.
Kernel: [T0] Preparing for changing the physalloc algorithm to something more simple.
Kernel, Loader: Load context, PMM stubs, System Info struct.
Kernel: Typo.
Kernel: renamed physical_alloc to physmem.
Kernel: [T0] Added BIOS and kernel binary to unusable memory areas.
.
url düzelt
style updated
some tests....
- Fixed expand tree behavior in ssh source.
docfix: g:vimshell_interactive_echoback_commands' default value isn't in iexe.vim but in plugin/vimshell.vim
- Fixed changelog.
Change dependencies name
Only attempt a reconnect if the connection timed out and we're not currently connecting.
Fixes #452.
Fixed bug with errors/warnings in organic listings
"add database"
Changed: green buttons to standard
Merge branch 'development' of https://github.com/Snadde/WebApp12 into layout
Change: Changed place of some columns in tables
Merge branch 'development' of https://github.com/Snadde/WebApp12 into development
Fix YogBox in technic launcher when selecting modpack build.
내폰에 주소록 저장 기능 완료
그룹 설정 UI 변경
Added support for HEX memory viewing

Added Hexadecimal display mode to the memory listing box. Now you can
choose wether you would like the memory display to display memory
locations in decimal or hexadecimal order.

Added an extra button which toggles the memory display to switch
between Hexadecimal and Decimal display modes.
renerer example changed
Upgrade external/srec to 4.2.1 version
Convert coffeescript to livescript, refactor the co2-contrasted directive
Since we're not tracking public anymore, make sure to rebuild it after deployment
Form default margin: 0
Fix example list with .right .button
Fix triggering section states
Layout events (section or article)
Test project for future 2.0 release
upgraded symfony from 2.0 to 2.1
Adding HttpListener HTTPS test configuration.  Tests no longer need to be run as admin.
Password reset relays to mailer function.
Correction d'un bug ou les trajets prives etaient listes
get/put; read/write mit 1 Byte
Adds the Feed importer for Course Recordings,
added correspondant for multi plugins
Merge branch 'devel' of github.com:ULAKBIM/NfQuery into devel
An example of a vox that ends with a lot of zeros.
Name the regional threads for easier debugging
Updated data
update data
Preview : set preview parameters and list contents
content type data fix
Merge branch 'master' of github.com:WebTales/rubedo
cleaner block rendering
update DB
Dark Apotheosis now use same stance bar as Metamorphosis if the the user enabled the option "Use an empty bar for Metamorphosis". However, there is a bug in the patch 5.0.5. Dark Apotheosis is not recognized as a stance which will result the feature to be broken or not allowing the player to make a macro for this stance. This should be auto-fixed and ready to use when Blizzard will fix this stance. (Source: http://us.battle.net/wow/en/forum/topic/6470967535)
User Request : Color the alt power bar according to Blizzard default texture color. (Example: Stone Guards Boss)
Fix for ticket #168. (No indication of ignored equipment slot)
Fix ticket #169. (No timer on Bonus Roll window)
User Request : Rez Icons on raid frames. (Available as an option, disabled by default)
Fix datatext time remaining for WG and TB when unavailable. Show "Unavailable" instead of 0.00.
Add our own master looter frame instead of using the buggy Blizzard master looter. This should avoid some rare issues we ween on tukui version older than 19.20.
15.20
Apply a git user (Fealys) patch for ticket 168 for gear management. Fix a rare lua error with pet journal on first login after WoW client start and finally, fix the cinematic skip popup window not being pixel perfect.
15.21
Testing GitHub Client for windows, nothing to see here!
Typo.
Typo.
Few new API calls, VERSION, PLAY/PAUSE, DISCONNECT
Merge pull request #15 from Uriziel/API

Merge some API improvements by Uriziel.
SubPicImpl: Check that the static resource is big enough.

This commit fixes some cases where subtitles weren't renderered using the internal subtitles renderer with DX9-based renderers.
DX7SubPic: Properly handle the max texture size.

This commit fixes some cases where subtitles weren't renderered using the internal subtitles renderer with VM7-based renderers.
fix a few cppcheck warnings:
* initialize var in the constructor
* reduce variable scope
* unused variable value
fix more cppcheck warnings
added binary test
Delete ldpi and mdpi drawables and add nightscreen icon
IT WORKS !! Finally packed interests as hardcoded text
Merge branch 'master' of https://github.com/Yakka/ludumdare
Fixed a format error
re-Added -Wno-format. I surrender at the over 500 warnings about wrong formatting. At least for now, I'll tackle that for sure some day.
Several fixes to get uae compiled again after the main repository merge.
strict ISO-C forbids empty source files, so have at least the includes. The linker will throw everything out anyway.
Indented (and cleaned up a bit) the cpu flags section for better readability and maintainability.
This file is nowhere referenced, and there is no sruct vidbuffer anywhere defined. This code is NULLed out until further notice.
Added missing prototypes and type changes. This eliminated the last warnings for an SDL/ALSA/GTK+ build using gcc-4.7.2 with -Wall -Wextra -pedantic. *YAY*
new file:   Companion.scala
Changed value of the string
Cappo's Banner.php generator
added getCA SOAP method
several chages

a) complete the generic page class
b) change the view pages
c) create public addBlocks.js
Testsuite
oops
ouch
flask create_app started
Implemented Draw***Inderect methods in Pipeline
Forbid %00 in URIs.
Fix error conditions check in conninfo_uri_parse_params.
small improvement of the current code block search
Fixed xo.scraping.page to support nameless inputs
Added referrer support to xo.scraping Session
Completed CardNumberPage scraper for BMO
add Helper module for test

add 'ascii' script test file
rename 01_ascii.t 02_ascii.t
add test file for 'roles' script
helper adapter should shift list instead pop
delete var for prevent unused var warn
modify helper adapter interval seconds if needed
add test for help script
add test for shorten script
add test file for 'tweet' script
set interval for decrease test duration
filtering problems
filtering working on one word query - but same word does not hash to multiple songs - FIXME
trying some new bereros options
New module for logs analysis; moved all about logs from Data importers to Logs analysis
agrgamos archivos iniciales
Updated README for opalscript specific building
using BigDecimal to get around problems with multiplying doubles
replacing 'multiply' with symbolic equivalents
use active duration when calculating weekly, monthly, and yearly totals
display the active duration in the last ride view
add average to the labels when displaying average speed, pace, and heart rate
display active duration on the ride list view
Added TextureObject (ref #42)
Added TextureTarget (ref #42)
Added TextureUnit (ref #42)
Stash commit. Everything works :)
Ensure service starts on boot
Emailers done
first
Merge branch 'master' of https://github.com/adjulbic/psorex
stylesheet test, tocss
cleaning up test conventions
more work on froth compiler
added new Jobs bundle
initial commit all current files
特殊的粽子
replace 4-space to tab
火影新剧场版剧透！
这次的剧场版说白了就是平行世界，类似于【妖尾】的平行世界，所有东西都颠覆
月读世界
鸣人 鸣人不叫鸣人，而是叫面麻，父母还活着，离开了村子，身上还是封印着邪恶的九尾妖狐，正因为印着邪恶的九尾妖狐，被体内的九尾的仇恨给吞噬，可以说是黑暗与邪恶的化身 外貌：带着面具（月读世界的面具男） 发型像佐助（黑发）  面部像鸣人 性格：像佐助 实力：超强（剧场版的boss) 会使用黑色的螺旋丸
点评：月读世界的鸣人早就离开了村子，现实世界的鸣人进入了月读世界，代替已经离开村子的黑暗鸣人，成为水门与玖亲奈的儿子。两个鸣人打过一次，黑暗鸣人输了，后来面具斑进入黑暗鸣人的身体和鸣人打第二轮……（进入他体内后实力大增，至少人家会开写轮，不过最后BOSS被鸣人独自击败，鸣人和面麻没有交谈，面麻被打败了就晕过去了。这次鸣人几乎没有开口遁。）


佐助 还是叫佐助 而且在村子 不过整天送玫瑰泡妞，是个花花公子，非常合群（和同伴们一起洗澡），热爱村子
点评：在电影中佐助才出来4,5次，只不过是个整天拈花惹草的花花公子，到处发玫瑰。说什么“我会一直保护你的”这种话（助一开始是设定为喜欢小樱这样的，大清早的爬小樱房间的窗台去献玫瑰，说“我会一直守护你的”这样。但是到后来发现佐助是个花花公子，他对每一个女生都这么说的。）
鼬与佐助连面都没见 至于宇智波灭门一点儿都没提。主要是这次主题是鸣人家

小樱 月读世界的小樱来到现实世界 现实世界的小樱来到月读世界 详情请看491话 现实世界的小樱进入月读世界的原因：中了面具斑的有限月读
小樱在现实世界里说她希望自己的父母别这么窝囊什么的，
所以月读世界里她的父母变成了英雄。不过小樱的父亲是前代火影并且战死


佐井 变成单纯画家
卡卡西 每句话都说的超大声，超元气 变得很爱逞强 写轮眼一路一直开着 要对敌了却因为一直开着眼打都没打就累趴下了 说白了超热血
雏田 傲娇+女王+御姐 外加暴露狂 因为喜欢鸣人所以讨厌小樱 而且讨厌死妹控宁次（正确的说法是讨厌变态）
鸣人小樱刚穿越过来最初遇上的就是红组三人，之中雏田看见他们俩大晚上了还在一起一下子毛了，揪起鸣人训，又凑到小樱耳边开着白眼（看来这边的雏田有一怒就开白眼的毛病）低声对小樱说：他是我的，你敢碰我跟你没完。（对鸣人那是超过喜欢变成独占欲了）

志乃 喜欢杀虫

牙 爱猫 讨厌狗
凯 变酷 做事样样没干劲
宁次 是个猥琐帝 喜欢雏田（利用白眼进行偷窥） 虽然现实世界的宁次本来就是死妹控 不过他是默默的保护雏田 而雏田也非常尊敬宁次 月读世界就不同 宁次的死妹控是变态 雏田对此非常反感
小李 喜欢天天 小李偷她内衣穿来着 被雏田发现 小李一开始还狡辩，后来被小樱不小心扒衣了看到穿着天天换下来的内衣
天天 被小李暗恋，实力变得很菜，使用忍具老是受伤，是个忍具白痴
丁次 不贪吃是个精壮帅哥
鹿丸 变成熊孩子了，踩着肥皂滑着玩 智商负200 爱看亲热天堂。。。。
与丁次的关系非常糟
井野 是个淑女 胆小 变得楚楚可怜，小鸟依人 不过鹿丸与丁次吵架时的和事佬 反正是变软妹了
纲手 现任火影 不过是飞机场 助手是巨R
自来也 还是惨死了 月读世界里他在成为鸣人的师傅之前就在任务里就死了

水门 还是那么的帅，就是变得没那么英雄了。发言：比起完成任务还是保护家人要紧，死了就没意义了呀！
实力差不多。就是缺少了一些英雄气概。
毕竟不是火影了嘛，顾家重要，打倒敌人其次这种思想
鸣妈 贤妻良母！但是还是那么火爆，很可爱，很好妈妈 四代鸣妈性格都没变，就是少了大不畏牺牲精神，儿子比敌人重要
鸣妈生气起来连四代都害怕（严母慈父）
其实鸣人觉得这个妈妈是假的，我没必要给她看好脸，所以一直很叛逆，但是鸣妈（这里该说是面麻妈？）一直认为鸣人是自己的儿子面麻，所以就作为母亲责备儿子而已
晓的成员 晓在月读世界里是正宗的佣兵集团，只要哪里出钱我们就拼死帮他们办事！这样的宗旨
然后纲手花钱雇了晓，晓去帮鸣人他们。所以鼬在这里算绝对好人（佩恩 鼬站在木叶这一边的，所以没有和他们交手）
鸣人和boss单挑去，跟鼬说小樱就拜托你了，为了不被卷入，鼬一把抱起想去鸣人身边的小樱跳上迪达拉的那个大鸟飞走了
在现实世界里的晓都是白绝变的。小樱打的是这个，很渣的。月读里的晓是被木叶雇佣这种状况，算是伙伴

【结局】黑化鸣人被鸣人打倒后身体变回了原样，昏倒在地。鸣人因为破了月读渐渐消失要回到原来的世界，他背对着父母，身后抱着地上的鸣人玖辛奈默默流泪，水门也就看着鸣人离去。月读世界不知道破了幻术以后还存不存在，不存在的话那也没办法说了。存在的话月读里的鸣人一家三
【西安 好地方】当全国都洪水泛滥时，西安安然无事
当北京沙尘暴来袭时，西安安然无事；
当南方强台风登陆时，西安安然无事；
当泥石流滑坡时，西安安然无事；
当冰雹降临时，西安安然无事；
就是在地震发生时，西安仍然安然无事。
知道为什么西安是历代王朝定都的地方了吗？
张继科夺得男乒单打冠军，为中国斩获第18金！
今日羽毛球多项焦点赛事：“超级丹“将亮相男单半决赛，
女子单打半决赛也会举行，混双将进行金牌争夺。
到底会有多少场“中国德比”发生呢？
台风“苏拉”“达维”来袭
中央气象台消息，昨日23时至今晨5时，
达维已给江苏连云港、山东临沂、日照、青岛、潍坊带来30-80毫米降雨，日照、临沂局地100-180毫米；
苏拉登陆前已给福建东北部、浙江中东部等地造成30-80毫米降雨，福建平潭局地达100-120毫米。
山东省发布台风红色预警，天津市发布台风黄色预警。
双台风来袭，大家注意防范！
Removing as many stmfadm commands as possible, and parsing xml instead.
Sorting functions to make the source more navigable
Awk needed a negative search
Added check for default tpg
Adding plural CLI options
Added CMake make system
Fixed MSVC define for newer compilers
shutting_down_ uninitialised
destruction had aliasing local variable for shutting_down_
Merge pull request #20 from DeanoC/master

Fixed a few bugs whilst getting it to work on the latest MSVC, and introduces a CMake build script as a starting point.
mocked out the email creation
example of dynamic wrapping with snap off funcs
UPDATED
submit.php
application/views/pages
Use symlink as root.
nova versao de framework
correcao do comando 7zip
singleThread
#16 doco fix
Prepare 0.0.1-alpha1 release
[#23] Zofe ep.2 com markdown
[#23] Zofe ep.1 com markdown
[Closed #23] Zofe ep.0 com markdown
Fix for flickering hover on nav tabs

Hover effect only happened when cursor is over text in the tabs.
Required dimension through float + width.
Fix find-my-local view list items

Display:inline-block only works on IE6/7 if the element's default is
inlin. See: http://www.quirksmode.org/css/display.html
Footer fixes for IE6/7

Mostly related to those browsers handling of display:inline-block (see
alphagov/static@8cd87d58fbbc2c48acd0d805b0ab7a10a3c9cbce)
Merge branch 'master' of github.com:alphagov/static into browser_testing_2
Updated footer with new category 'Disabled people', also updated the order of items to match the homepage
Updated the content licence text, which has been apprived by EP
Merge remote-tracking branch 'origin/updated-footer'
Add :last-child pseudo selector test
Updated to new version, ref. https://github.com/Modernizr/Modernizr/pull/304#issuecomment-5644788
adding .editorconfig to normalize on whitespace standards.
phantomjs toString()s a window different than Chrome does..
new flexbox test got shuffled because the property was renamed. fixes #611
whitespace changes in unit tests. thank you editorconfig.
Revert "new flexbox test got shuffled because the property was renamed. fixes #611"
reverting so i can accept myakura's patch instead.

This reverts commit aa226a9e660b4506f8767e8a1366f5f00bf7d977.
update Modernizer.flexbox to support both WD and LC implementations. fixes #611
death to the URL scheme!
Merge pull request #304 from laustdeleuran/master

Last-child pseudo selector test
adding metadata for lastchild selector test. ref #304
removed the "!!" from the "a-download" test, as it's not needed
feature detection test for insertAdjacentHTML
Changed conky theme
Updated frontend for the new authentication system

Added simple_form
updated forms to bootstrap/simple_form
added login/logout/register/profile
added styles
user(modify & delete),user validation(email regexp)
Khushal/Pooja: Added simplecov to see the test coverage
truncate AMA titles to 255 characters in length
Added goodies to secret rooms!
ps3: Seek via L2 and R2 buttons

Fixes #1041
theme: Make sysinfo box underscan compensated
work in progress to ignore manifest orientation and fix cut the rope
remove old-style manifest-based orientation handling
remove unused orientation styles from system.css
Revert "remove unused orientation styles from system.css"

This reverts commit c1a1f42b889c3c38cd3daa0909b99c40d2783101.
Revert "remove old-style manifest-based orientation handling"

This reverts commit c2123f709b7b08421e9b59a1f788be8e483596cf.
Revert "work in progress to ignore manifest orientation and fix cut the rope"

This reverts commit 20c2ce8346a3108a39f45248c9c7273c433e087b.
Merge branch 'master' of git://github.com/andreasgal/gaia
change screen variable to screenElement to avoid conflict with the global Screen object
update manifest.json files to specify the app orientation to lock
wip orientation lock code
force task switcher to portrait mode
force lockscreen to portrait mode
portrait-primary, not portrait
Merge pull request #1381 from davidflanagan/orientationlock

honor manifest.orientation property with screen.mozLockOrientation
code cleanup
Merge pull request #1211 from fabi1cazenave/wifi

[wifi] front-end for 'forgetNetwork()'
fix test
Merge pull request #817 from davidflanagan/newtests3

convert more tests to use the new framework
Auto-merge from branch 'master'
Thought I could write a failing test case for ::Spec and ::RSpec in Spork::TestFramework::RSpec#rspec1?. Realized that RSpec itself was colliding with my attempts to stub the methods.
wire: propagate extended callback, mixin fires extended callback as well
Fix incorrectly decoding strings

parseInt is defined as taking string parameter; behavior in node.js is anything other than string is passed
Merge pull request #17 from Contatta/quote-print-fix

Fix incorrectly decoding strings
Merge pull request #28 from andyburke/master

Fix timeout handling...
Release v0.7.13
Added encoding parameter for request
Add encoding response text with iconv/lite and encoding parameter from request
Add dependencie on iconv-lite
Merge pull request #30 from relictM/master

Add  paramter to request for response encoding
Release v0.7.14
Don't change request.query if no other query exit in options
Merge pull request #31 from relictM/master

Paramters in url for get request
Release v0.7.15
make it work in the browser again
Release v0.7.16
checkin compiled source
Release v0.7.17
Release v0.7.18
log the curl requests
add curl log support
add curl to README, and fix some bugs
Release v0.8.0
take version and "node.js" out of user agent.  fix readme
reNX: Add LZ4 license to comply with BSD.

Signed-off-by: angelsl <hidingfromhidden@gmail.com>
Start without PyCrypto.
gdgv
Added configuration map to solution makefiles

--HG--
extra : rebase_source : 7154f374d605450853f4ea475847c9e1877a79c9
Added tests Readme
fix up minor type - AnsibleException should be AnsibleError
Merge pull request #94 from skvidal/master

minor typo of AnsibleException/AnsibleError
make sure the setup step in a playbook has the sshpass included
Merge pull request #95 from skvidal/master

buglet - make sure sshpass is included in runner for setup in playbooks
Reinstate raw module
Resolve traceback when python-selinux is not installed
Merge pull request #1438 from dagwieers/selinux-module-fix

Resolve traceback when python-selinux is not installed
Add DOCUMENTATION to nagios module.
Merge pull request #1183 from tbielawa/nagios_docs

Add DOCUMENTATION to nagios module.
change cdvi dir
Static loading mode

Added static module loading support, where all required script tags are
included on the page, rather than being added by the loader. This also
enables the usage of a lite loader, which for now is an internal
implementation.
Fixed #18393 -- Prevented blocktrans to crash when a variable name is badly formatted.
Merge pull request #94 from jphalip/tickets/18393-blocktrans-valueerror

Fixed #18393 -- Prevented blocktrans to crash when a variable name is badly formatted.
Fixed #14681 -- Do not set mode to None on file-like objects.

gzip.GzipFile does not support files with mode set to None.
Rewrote test_error_messages with helper test utility.
Fixed #18407 -- Made model field's to_python methods fully accept unicode.

When generating error message in to_python, any unicode string
containing non-ascii characters triggered a UnicodeEncodeError for
most field types.
Moved test_client_regress tests from models.py to tests.py
Cleaned up test_client_regress tests
Fixed #18408 -- Isolated flatpages tests from existing sites.

Resolves Flatpages test issues by:
 - Creating an example_site fixture
 - Overriding project SITE_ID setting to 1
 - Normalizing the use of the hardcoded (1) site_id to settings.SITE_ID
Fixed #18409 -- Made RegexField work with unicode characters.
Merge pull request #101 from jphalip/tickets/18409-regexfield-unicode

Fixed #18409 -- Made RegexField work with unicode characters.
Fixed a typo in a comment. Refs #17742.
Made inspectdb tests deal with a smaller generated models.py file.

Implemented this by adding a stealth table_name_filter option for the
command.
Removed debugging code added in last commit.
Fixed #18259 -- Specified that ROOT_URLCONF might be needed.

When using the template system in standalone mode and if the url
template tag is used, ROOT_URLCONF has to be defined.
Thanks techtonik for the report.
Fixed settings override in mail regression tests

self.settings_override from test subclasses were overwriting parent
attribute.
Fixed override_settings usage in test_client_regress
Made sitemaps tests use override_settings. Refs #14478
Fixed #14478 -- Isolated messages tests from custom TEMPLATE_CONTEXT_PROCESSORS
Remove the summary attribute of the table

In the discussion here: https://code.djangoproject.com/ticket/17138
it was decided that using the caption for this previously
non-visible part of the table element was not semantic, so in this
patch is moves that summary to the `title` attribute of the `a`
tag which when overed over, on most browsers, will show the text.
Fixed incorrect assert in test_filepathfield_folders
add initial travis file for tests.
Run build immediately when starting the rs-watch script.
Adding simple English language support for YUI modules.
Merge branch 'develop' of github.com:appfuel/appfuel into develop
Megacommit.
Default to archit.el for personal customization, no matter what the user name.
Site updated at 2012-03-19 01:31:22 UTC
finised documentation of SimpleGui example
eliminate LOW population density
Merge branch 'dev' of github.com:ariesteam/aries into dev

Conflicts:
	plugins/org.integratedmodelling.aries.administration/etc/catalog/Geoserver_REST_database.xls
Added rendered track
add command line parameter support
Update install scripts from Arx Libertatis
kvm tools: Add vhost-blk support

vhost-blk is an in-kernel virito-blk device accelerator. vhost-blk is
similar with vhost-net. It handles virito-blk's request and completion
in host kernel side.

How to use:
-----------------------------
Load the vhost-blk.ko module in host side and specify the vhost flag.
   $ lkvm run -d disk.img,vhost

Performance evaluation:
-----------------------------
The comparison is between kvm tool with usersapce implementation and kvm
tool with vhost-blk.

    Fio with libaio ioengine on Fusion IO device
    IOPS       Before   After   Improvement
    seq-read   107      121     +13.0%
    seq-write  130      179     +37.6%
    rnd-read   102      122     +19.6%
    rnd-write  125      159     +27.0%

Signed-off-by: Asias He <asias.hejun@gmail.com>
Update docs/units/index.rst

Typo fix
Fixes an annoying warning that can come from pkg_resources when running
astropy.test():

```
>>>> astropy.test()
> ^[[0;33mWARNING^[[0m: Module _pytest was already imported from
> c:\python27\lib\site-packages\astropy\extern\pytest.pyc/_pytest, but c:
> \python27\lib\site-packages\pytest-2.2.1-py2.7.egg is being added to
> sys.path [_pytest.core]
> ^[[0;33mWARNING^[[0m: Module pytest was already imported from
> c:\python27\lib\site-packages\astropy\extern\pytest.pyc/pytest, but c:\p
> ython27\lib\site-packages\pytest-2.2.1-py2.7.egg is being added to sys.path
> [_pytest.core]
> ^[[0;33mWARNING^[[0m: Module py was already imported from
> c:\python27\lib\site-packages\astropy\extern\pytest.pyc\py, but c:\python27\
> lib\site-packages\py-1.4.7-py2.7.egg is being added to sys.path
> [_pytest.core]
```

This happens if you have a package installed in site-packages, but you import it from somewhere else *before* pkg_resources is imported.  That's exactly what's happening in this case, where we're using the bundled py.test to run astropy.test().  But in the process of importing py.test, pkg_resources gets imported.

When pkg_resources is first imported it builds a "working_set" of all packages available on the path (by processing .egg-info directories).  Here's it's saying "Ah, there's a package called py.test in your site-packages, but you already have a package of the same name in your sys.modules imported from elsewhere, so I'm going to skip this one".

The fix is to simply make sure pkg_resources, if available, is imported before py.test.
Merge pull request #537 from iguananaut/fix-test-warning

Fixes an annoying warning that can come from pkg_resources...
changed: remove unused IFile callback from GUIWindowFileManager
added: listen to GUI_MSG_UPDATE in GUIWindowFileManager
added: comparison operator to CFileOperationJob
refactor: split off action to string into GetActionString
changed: background file manager operations
added: possibility to cancel file manager operations
extend xbmcvfs with stat
[OSX] cleanup unused variable
Merge pull request #1537 from takoi/stat

[python] extended xbmcvfs with stat
Merge pull request #1541 from cptspiff/bgfileops

changed: background file manager operations
fixed: some network locations could be deleted and some not. As we remove and/or add slashes all over its better to compare the url without the slash at the end.
cosmetic: remove the slash at the end of shares in the network setup dialog. it looks nicer and will be added internally anyway.
fixed: remove slash at the end in CGUIDialogFileBrowser::OnPopupMenu when editing network locations as we do in CGUIDialogFileBrowser::OnAddNetworkLocation().
Openvpn from anywhere, no need to reload gemset when sourcing bash profile
Heroku toolbelt config
Tweaks and bug fixes.
Changed prefs key.
Added the manual.
Support for SDK 1.5. Latest installed speech recogntition engine is chosen
for speech control demo.
SDK 1.5 Wrappers.
Added TestUnit again and also added a proper RSpec test using the rails generator
updated the index view
fixed failure of service to restart after a reboot
add %post section to control services to .spec file.