labofsahil/github-event-dataset-2012 huggingface dataset:
test module comments

--HG--
rename : test/compiler-test-files/dependent-key.xhtml => test/compiler-test-files/comments-key.xhtml
rename : test/compiler-test-files/dependent-pre.xhtml => test/compiler-test-files/comments-pre.xhtml
rename : test/compiler-test-files/dependent.txt => test/compiler-test-files/comments.txt
rename : test/compiler-test-files/dependent.xhtml => test/compiler-test-files/comments.xhtml
check for existence of XMLSerializer before trying to use it
Working on actions queue building
add split.rb
fixed vim colorscheme for iterm2
Add default value for addFramingBit to XiphComment::render()
Remove obsolete constructor from WavPack::Properties
Default parameter values in RelativeVolumeFrame
Minor change
* esxml.el: Modified esxml-link to handle any number of arguments as
  body, as normal.
Explain length() of a data frame and introduce ncol and dim
Finished naive bayes classifier
Added quality rate algorithms, added weights for features.

Current quality:

for train1.csv
Train quality : 0.935
Q-fold quality : 0.932

for train2.csv
Train quality : 0.787066
Q-fold quality : 0.750789
minimize locking in CAMQPSessionManager + increase default session i/o window size
queue MT tests
basic queue sample
cleanup AMQP endpoint after peer abortively disconnects
update gitignore file to ignore .log files
Added base packet module along with a base server class
beesh: add check for already existing bee package and bee-file

stop build process, if a suitable bee package or bee-file already exist
release: Bump version to 1.1

this is a bugfix release..
bee-install: Change the way deprecated FILES file is handled

The FILES file will be extracted as CONTENT.FILE.
The CONTENT file will be converted from the CONTENT.FILES file.
The CONTENT.FILES file will be removed after conversion.

(partially fixes issue #113)
bee-install: Change the way the CONTENT file is installed

Extract CONTENT file as CONTENT.INSTALL
After everything is extracted rename CONTENT.INSTALL to CONTENT.

This is part of the preparations to fix issues #113 and #114
compat-fixmetadir: Add script to fix metadir changes since pre 1.0

usage: compat-fixmetadir <dir> [dir..]

If no dir is given compat-fixmetadir will use BEE_METADIR if set.
bee: Move METADIR-compat code to bee-wrapper

.. and remove it in the tools..
This makes sure that the compat code only runs once per bee invocation.
The compat code will fix the METADIR of ALL installed packages - if needed.

This is part of the preparations to fix issues #113 and #114
Merge branch 'bee-cache'

* bee-cache:
  bee: Move METADIR-compat code to bee-wrapper
  compat-fixmetadir: Add script to fix metadir changes since pre 1.0
  bee-install: Change the way the CONTENT file is installed
  bee-install: Change the way deprecated FILES file is handled
Merge remote-tracking branch 'remotes/tobi/beesh-rebuild'

* remotes/tobi/beesh-rebuild:
  beesh: add check for already existing bee package and bee-file
beefiledb: added initial version of beefiledb
Scratch one from the TODO.  Woot!
neocomplcacheが有効になってなかった・・・
Document NodeList and allow multiple nodes to be appended at once.
now in Java 1.6!
New version of thkeen.net
preview and some default styling
Add typename to the using declaration inside thrust::pointer.

Contributed by slayoo from GitHub.

Fixes #113
Merge pull request #114 from jaredhoberock/integrate-issue-113

Add typename to the using declaration inside thrust::pointer.

Fixes #113
matz の twitter アカウントを間違えていました
code style: move from 2-space indent to 4-space indent
code style: refactor
- split up main for unit testing
- using print function
- description for --help
- remove [rosbuild] in output
- fix variable names
- don't duplicate code
- pychecker + pep8 checks
bugfix: script works before make install
code style: extracted duplicate code, reduced line complexity
Note that there is a path change from workspace/share/catkin... to workspace/catkin in init_workspace
Also note that Also note that in find_in_workspaces, search_dirs = list(search_dirs or []) is sligthly
different from search_dirs = [search_dirs], as list({'a': b}) == ['a'], not [{...}], but I think that's not worse.
code style: Less hacking and no duplicate code
This still maintains order of folders to search.
Assuming in help --libexec searches in libexec/PROJECT, not lib/PROJECT
unit test provided for argparsing
weird * notation, probable bug?
GUI: turn off multitouch and red dots
Added examples/ folder, removed tests/ folder
added ArrowDamageIncreaseTrait. Fixxed some Chat issues. Added DwarfSkinTrait
Fix User Entity
Create Admin action
Refactoring to operate as either a command-line tool or as a library.
Add markdown renderer class boilerplate
Added .rvmrc to ensure that we're using the proper version of Ruby.
Updated the Gemfile to include a gem that installs v8 to solve this
problem:
  http://adanacs.com/node/3
Very small changes to the README.
starting MPI parallelization
list command-line arguments
reverted to pre-images directory; need to work out bugs
support for routerId
Show number of bikes/docks separately
periodically refresh bike station availability from remote data feed
Ability to specify own bike instead of bikeshare bike
make bikeshare default mode on startup (rather than personal bike)
new gradient-based images
add IconFactory to index.html
fixed bug w/ percentage-based icon display
Use OAuth for authentication in unit tests.

Basic Auth is no longer supported.

Signed-off-by: Vinson Lee <vlee@twitter.com>
Merge pull request #179 from vinsonlee/use-oauth-in-tests

Use OAuth for authentication in unit tests.
ch 27: listing 27-5
chrome: add mklm app
document the Vm object
Fix: fork
Fix: exit(0)
Fix: manually flush log
Fix: python cached-default-value issue
Remove unused time in log
Merge branch 'master' into devel

Conflicts:
	osudl
Remove debug printf and cleanup TODOs.
Updated About, added links to describe terms.
another cosmetic change only about <space>] and <space>)
actually puts blocks
destroys existing blocks only when it's enterable
handle executing on a non-configured branch
Add /current to nginx config
Add edit page
Allow to change date during update
Tweak fields to use textarea
Add a PathBindable to convert url params to Date objects
Minify client-side JavaScript during build
Merge pull request #420 from teropa/master

Minify client-side JavaScript during build
fix trivial typo
Merge pull request #389 from dpetzel/gh-pages

Fix VERY trivial typo in python tutorial
Oops. Too much copyrighted.
Attr accessible on top.
Spec order: mass assignment, associations, validation.
Continue with reordering.
Add pagination to tasks.
Actualy added "The Game"
Some tab widgets updates. Filedialog added for opening files.
Include cctype for isprint.
Añadido fichero configuracion.txt
Replaced exe_cmd with run function which invokes subprocess command
Replace subprocess with utils/run function
Replace subprocess with utils/run function
Remove obsolete code
use better way to get the loopback interface's ip address
added experimental support for -encoding(E) attribute, with E=latin1|utf8
added shpexport man page
Default theme
Global css
account login modification
Merge branch 'discussions' of github.com:vtemian/aisec into notification
inbox <-> public dis
restore revertability
+ ‘Maps/OSM/17/69051/40944.png’
+ ‘Maps/OSM/17/69051/40945.png’
+ ‘Maps/OSM/17/69051/40946.png’
+ ‘Maps/OSM/17/69052/40944.png’
+ ‘Maps/OSM/17/69052/40945.png’
+ ‘Maps/OSM/17/69052/40946.png’
+ ‘Maps/OSM/17/69053/40944.png’
+ ‘Maps/OSM/17/69053/40945.png’
+ ‘Maps/OSM/17/69053/40946.png’
+ ‘Maps/OSM/17/69054/40944.png’
+ ‘Maps/OSM/17/69054/40945.png’
+ ‘Maps/OSM/17/69054/40946.png’
+ ‘Maps/OSM/17/69055/40944.png’
+ ‘Maps/OSM/17/69055/40945.png’
+ ‘Maps/OSM/17/69055/40946.png’
+ ‘Maps/OSM/17/69056/40944.png’
+ ‘Maps/OSM/17/69056/40945.png’
+ ‘Maps/OSM/17/69056/40946.png’
Correction of README.
fixed bug in navbar link, thanks Anthony
added some debug lines; fixed a bug in setFile(); added mime type x-zip-compressed; reformatted code
change tvplayer ipa
commandId have been eleminated (as there is no use in that field)
automatic save function have been added to teststorage - it is not needed in mongo storage but should be done there as well because of API compatibility...
Merge branch 'master' of https://github.com/webgme/webgme
reorganized stuff (need to come up with a good directory layout)
World download in ZIP format
Added funcionality to create tables and columns (though not save them to files yet).
initial commit
Merge branch 'master' of https://github.com/willem-o/lgcc
框架：增加url小写映射和路径整合功能
conf: by default don't provide WHATTOSYNC paths
build: prepare for next version
Mejoras en la arquitectura de consultas.
Move tests to separate dir. Add logout test.
adding deploy to dev button

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134871 a5903396-d722-0410-b921-86c7d4935375
Adding caching configurations for OAuth.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134949 a5903396-d722-0410-b921-86c7d4935375
Adding token and client credential caching support for OAuth implementation.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@134950 a5903396-d722-0410-b921-86c7d4935375
Adding login-logout functionality


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126056 a5903396-d722-0410-b921-86c7d4935375
Separated out throttle logic from auth logic - Introduced an API to read the API manager configuration

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126057 a5903396-d722-0410-b921-86c7d4935375
Updated feature pom to import updated artifacts

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126058 a5903396-d722-0410-b921-86c7d4935375
adding saml attribute profile codes

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@138849 a5903396-d722-0410-b921-86c7d4935375
Added tech owner and business owner fields for add-api and edit-api pages

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128751 a5903396-d722-0410-b921-86c7d4935375
Added tech owner and business owner fields to add api method and get api method

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128752 a5903396-d722-0410-b921-86c7d4935375
Fixing the button size problem for edit page

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128729 a5903396-d722-0410-b921-86c7d4935375
sju.js updated to read URL's for homestates

Template.php updated to reflect template suggestion for page--homestate
as well as page--homestate / node--homestate templates have been created
Improved test options.
aefsdfefddd
Benchmarks fix
Full processing of UDP packets
BoxManager erstellt
omindex.cc: Tweak previous change.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16755 6b2f1b92-a4f3-0310-943f-de3cbe41748b
api/compactor.cc,api/replication.cc,backends/brass/,backends/chert/,
common/,net/remoteconnection.cc: Rename msvc_posix_rename(), etc to
posixy_rename() (avoid a posix_ prefix as that's used by some library
functions, and these aren't necessarily 100% POSIX compatible), and
provide macro versions on Unix, so we can avoid a #ifdef at every
call site.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16956 6b2f1b92-a4f3-0310-943f-de3cbe41748b
configure.ac: Use user-specified LIBS for configure tests, which is
what's expected, and provides a way for the user to tell configure
where to find library functions which configure can't find for
itself.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16957 6b2f1b92-a4f3-0310-943f-de3cbe41748b
backends/remote/remote-database.cc: Make the UnimplementedError for a
MatchSpy which doesn't implement name() clearer that it's this
particular subclass which can't be used remotely, not all MatchSpy
objects.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16959 6b2f1b92-a4f3-0310-943f-de3cbe41748b
net/remoteconnection.cc,net/remoteconnection.h: Only "outline"
RemoteConnection dtor under __WIN32__.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16960 6b2f1b92-a4f3-0310-943f-de3cbe41748b
common/replicate_utils.cc: Make posixy_open() always use O_BINARY.
backends/brass/brass_btreebase.cc,backends/brass/brass_database.cc,
backends/brass/brass_databasereplicator.cc,
backends/chert/chert_btreebase.cc,
backends/chert/chert_databasereplicator.cc,common/posixy_wrapper.cc:
Don't pass O_BINARY to posixy_open() in the places where we were
(which wasn't everywhere, probably causing replication bugs under
__WIN32__).

git-svn-id: file:///home/xapian-svn/xapian/trunk@16961 6b2f1b92-a4f3-0310-943f-de3cbe41748b
tests/api_replicate.cc: Use O_BINARY in replication tests.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16962 6b2f1b92-a4f3-0310-943f-de3cbe41748b
Generated file fixes
Clarify the README to require bundle exec
Add defaultValue support
Add support for defaultValue
Update packages/ember-data/lib/adapters/rest_adapter.js
Merge pull request #123 from MikeAndrzejewski/master

Remove dead code in REST adapter
The 'integer' attribute should be called 'number'

Also update BREAKING_CHANGES.md and update the
README to reflect the required revision number.
Workaround to allow YUI Compressor to compress Ember Data.
Rename typeMap names
If we search by type, why not index by type?
Fix failing tests
Streamline store access of internal maps.
Make load work without shimes5 mode
Update version of Ember
Add flag for including associations in toJSON()
Added embedded option to toJSON()
Add more inline docs to DS.Store
Give foreign key to child records, include in JSON

When adding a record to a hasMany association, we
should update the inverse belongsTo relationship
on the child record. Additionally, calling
`toJSON` on the child should include the foreign
key in the hash.
Break up and document `toJSON`.
Add naming convention support.

This is a work in progress, and the API will
probably change a bit. At the moment, only attrs
can have naming conventions, but foreign keys will
work as well.
Merge pull request #128 from pixelcort/yuicompressorworkaround

Workaround to allow YUI Compressor to compress Ember Data.
ttt
Signed-off-by: Xiong Yang <snake.xiongyang@qq.com>
dumpPhp: Fix for a bug in dumping associative arrays with numerical keys that are out of order.
test commit

ss
Create ServiceProvider(RMContainerAllocator.java) between ResourceManager and ApplicationMaster. Refresh DragonAppMaster.java with using RMContainerAllocator to communicate RM. Modify the JobState transfer procedure to JobState.NEW -> JobState.START -> JobState.RUNNING -> JobState.SUCCESSED.

Signed-off-by: Ji Jiannan <flyicewolf@gmail.com>
Merge pull request #35 from flyicewolf/master

#35 Add the ContainerAllocator service between RM and AM
Create the DragonExample.java to replace TestClient.java for running submit&monitor functions.
Merge pull request #36 from flyicewolf/master

#36 Move TestClient to DragonExample
added round trip tests - string to object to string and
object to string to object
added static Assert class since Android ignores the standard
assert keyword. Updated the tests to use it instead of std assert.
Fixed a defect exposed by running the Assert class tests that
included an extra " when using Booleans.
added examples for android and Java use.
also modified the library to use timestamp default
strings rather than date default strings.
Fixed TestObject to work with timestamp strings.
changes search to use RegEx.
Implemented HiPE Calling Convention

Implemented a new calling convention (cc 11) for HiPE similar to GHC's cc 10.
In detail:
 * Inserted new symbol "cc 11" (CallingConv::HiPE).
 * Created cc and retcc for both 32 and 64 bit.
 * HiPE cc defines no calleE-save registers (use CSR_NoRegs).
 * HiPE cc supports tail call optimization.
 * HiPE cc uses GR32RegClass for tail calls.
 * Created testcases.
 * Updated Docs (LangRef.html and CodeGenerator.rst).
HiPE prologue code emission for X86 (modify PEI)
More fine-grained checks for prologue
Added dbg info for hipe prologue
A Garbage Colleciton plugin for HiPE's gc scheme

Implementation of a custom gc plugin to write specific stack descriptor
information in ".note.gc" of an Elf64 object file. This information is parsed
with an Erlang binary parser and transformed to special data structures to be
loaded by Erlang/OTP system's loader.
Print dbg arity
age&url
test code
modosi
FIxes and little new features to lists
[images][x] modify property lastPathToNetworkImage from readonly copy, to retain
add: tests for views of /sys/feedbacks/show
modify: tests for /sys/users/show
follower ids are unique
Add some elisps for highlighting.
changed pathogen to be version control'd as well ;)
makefile.lin dosyası düzenlendi.
rhbz831067 report correct number of replacements using targetChanged flag
move cobertura plugin to server pom
Merge branch 'master' of github.com:zanata/zanata into integration/master
Fix GlossaryDetails implementation
Initial version of persistent editor options.

Not working fully.
Implement save for a single option.

The Display Editor Buttons are now persisted in the db.
Move HEditorOption table change to a new changelog file for 2.1
Persistent editor options.

Finsh Save implementation.
Add a button to load the persistent options.
Add a button to restore the editor options to their default values.
Rename HEditorOption to HAccountOption.
Revert to immutable config options class.
simplify ngram analyzer selection in StringListBridge
4bpp palettized PNG support
Update API for ZMQ 3.2.0-rc1.
Add support for context options.
Add support for unbind and disconnect.
first base commit
base commit
base commit
d
d
base commit
base commit
Merge branch 'master' of https://github.com/zhang156/base
第一个版本

第一个版本：增加“读我”
Upgrade Operadriver to 0.17
mass version change from 1.11-cvs to 1.11-git
done client
Merge branch 'master' of github.com:zobac/LinuxA3

Conflicts:
	server/includes.h
	server/server
	server/server.h
	server/server.o
	server/serverMain.c
	server/serverMain.o
	server/wrappers.o
still trying
JobQueue done
rename Query to SimpleQuery
Creation of basic users table
Creation of base user table
added first_of
movespeed
Merge branch '0pq76r' into dev

Conflicts:
	local/player.h
draw_to_screen:fixed deformed texture
update glibc to 2.16
vimperatorのhistory-commandをGitの管理外に
Create a getBaseUrl method on Client
Merge pull request #10 from 99designs/features/add_geturl_to_client

Create a getBaseUrl method on Client
Added tests for indirect addressing modes quirks
fighters
cleanup
searching ebay works
Minor code mix-match.
Basic implementation of adding custom stations works. Will need to be expanded.
More song detection fixes.
Alignment of top nav
add fixtures, update image for tinymec, ....
Adds logging for renaming and hardlinking.

This will provide a bit more visibility into what's happening when dom0
plugin generates an exception.

Change-Id: Ia529956ee4fc56e49efdcf2cca4f42fc8ebcc3ea
Merge "Adds logging for renaming and hardlinking."
Adds missing copyright to migration 082.

Change-Id: Ib43d3efed1aed8f4d955208aebb627206b106f30
Default auto-increment for int primary key columns

Consistently rely on the default auto-increment flag for integral
primary key columns (rather than being explicit in some cases and
implicit elsewhere).

Change-Id: I5da89b286b199b0ddb709ca882699e9419ec68e0
Merge "Default auto-increment for int primary key columns"
Merge "Adds missing copyright to migration 082."
Docs: fix typo
initial 0.13 change summary
Docs: fix typo
API documentation in Extracted
remove deprecated Extracted.evalTask
move Eval test to correct location
Docs: note that plugins are loaded in a parent loader of build code
Allow cleanKeepFiles to contain directories

The directory contents will be kept as will empty directories.
Fix incremental compilation problem with package objects inheriting from invalidated sources in a subpackage.

Resolution of https://issues.scala-lang.org/browse/SI-4695 seems to be to deprecate
inheriting from a class in a subpackage.  This commit is an alternative solution,
possibly to be reverted or restricted if resolution of SI-4695 changes or if this
proves to be too conservative in practice.

Review by @gkossakowski.  With separate inheritance/function call dependency tracking,
this probably should only pull in package objects with inheritance dependencies on
invalidated files.
Multi-line prompt text offset issue (ticket #625)
minor cleanup of previous commit: var->val in sbt.JLine
Adapt new libgit2 API for clone/checkout.
fixed example output in readme
Setup connection info.
test_revised
Change name of README
Commit 00:29 03/06/12
TL;DR

form woeid, get twitter TT, remove db in conf (not needed now)
RM FUCKING DB FILES
Merge branch 'master' of https://github.com/Baztoune/myApp

Conflicts:
	app/controllers/Application.java
Logging displays objects. Added port to status.
Added first round of documentation

git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@152591 91177308-0d34-0410-b5e6-96231b3b80d8
OPT: Reduce number of pthread_getspecific by 1/2
micro benchmark for ContextPtr
Merge branch 'master' of github.com:BlueBrain/dash
resolved the keyboard
Added error notice to delete ui
Update to remove bad m4 rule in Makefile.am`
Added getDeleted to model.java
Fixed build error
Merge pull request #66 from CS340Group/beebe

Beebe
make goog test simpler
leaflet layer bounds bug commented
removed comment extend bounds
Smoothing des déplacements
Merge branch 'master' of https://github.com/ClubEngine/gj4
GLclamp to GLfixed
Install fix
* Backported from 1.0 getting the texture from the pixmap to rgb as it was not working for other depths thatn 16bpp
NB#167256 crash in glDeleteTextures()

    * clutter/eglx/clutter-backend-egl.c: don't clean up when the program exit()s
remove more fake fields from person
Have `batch.sh` use latest binutils release.
Fixed source code format.

* template/x86_64-unknown-linux-gnu/site-config.jam:
Just fixed source code format.
Changed to build ICU4C latest instread of 49.1.1.

Previously, ICU4C 49.1.2 could not be built with GCC snapshot. But
ICU4C latest (50.1 or later) can be now successfully built with GCC
snapshot.
Network Detect
Update Gemfile.lock to incorporate new Gemfile changes.
Add config/deploy/database.yml.erb for capistrano deployment.
Added error output to switches
added skip-satisfy and skip-satisfyL
added more char parser tests
Add ParseKi
added test functionality using camera
basic header comments
Example of input from a port
line 416 was too long, removed the comment
- Added data connection and MySQL support (again)
NF: Add __repr__ string for Connection and Mapper.
RF: registered_objects → registered_entities
RF: declared_params as named argument.
NF: Entity gets a special context property.
NF: Reverting the ‘cleanup’ in find.py and adding context search.
BF: Fix super_find for complete objects. (WIP?)
Premier pas vers l'interface de connexion
Ceci n'est purement que visuel
change query.js
Fix problem when agent throws exeception.

Agent execpetions were not producing the agent removal.
Fixed LFGDungeonReadyStatusCloseButton skin.
Added PetBattleQueueReady sound warning for me.
Fixed CompactRaidFrameManagerDisplayFrameLeaderOptionsRaidWorldMarkerButton skin if RaidTools is disabled.
Cleanup.
Merge branch 'master' of https://github.com/Shestak/ShestakUI.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
车载类
Signed-off-by: name07 <122419795@qq.com>
Merge branch 'master' of git://github.com/THOK-SW/wms_rfid.git
车载入库作业
Signed-off-by: name07 <122419795@qq.com>
增加下载配送站和配车单下载累，把梧州那边配送员改成送货线路
调度增加下限量
Signed-off-by: loou <loou@vip.qq.com>
配车单更改名字
Signed-off-by: loou <loou@vip.qq.com>
上报修改，添加用户bug修改
Signed-off-by: zqloon <zqloon@gmail.com>
仓库信息设置修改后货位树及时更新
Signed-off-by: zqloon <zqloon@gmail.com>
车载-入库作业
Signed-off-by: name07 <122419795@qq.com>
入库作业-微调
Signed-off-by: name07 <122419795@qq.com>
改改删除7天之前的数据。时间和字符报错
Signed-off-by: loou <loou@vip.qq.com>
入库作业调整
Signed-off-by: name07 <122419795@qq.com>
车载 → 出库，移库，盘点作业。
Signed-off-by: name07 <122419795@qq.com>
车载修改
Signed-off-by: name07 <122419795@qq.com>
分拣页面查询 添加可根据卷烟编码查询，
修改入库分配货位预设卷烟后不能入库其他卷烟，
修改调度时，库存不够不取整。
Signed-off-by: loou <loou@vip.qq.com>
Merge remote-tracking branch 'thok-zxl/master'
Merge remote-tracking branch 'zql/master'
Merge remote-tracking branch 'thok-zzb/master'
Merge remote-tracking branch 'jj/master'

Conflicts:
	code/Authority/THOK.Wms.Bll/Service/InBillMasterService.cs
	code/Authority/Wms/Wms.csproj
Revert "Committing a change to revert"

This reverts commit 40c31632cac5521d8780db22855b48b5b6f29dbc.
Added runBASC, runCWAS, and runGroupAnalysis
bash script using 'getopts' works with the 'source' command
Filter description translation
fix directlink() if anhor given
add gitignore
couple comments translation
disabled wraping for #hash links
added $.History.isHTML5Enabled() check
move history.pushState() in to History.add
recovering from serious lost of files and damage of repository
Created action_all_reports() method to the JSON controller
add temp/ .gitignore
removed command-t from readme
Change exception message
from "Graph is not connected" to "Graph is not complete"
input types added
Add MC versions to config packs
Merge branch 'dev' into version_support
Merge branch 'dev' into version_support

Conflicts:
	src/launcher/MultiMCLauncher.java
Merge branch 'dev' into version_support
Use `New Instance' dialog instead of a simple text entry one.

Instances now get an intended version setting. This is currently not used
anywhere else.
Merge branch 'dev' into version_support
Some much needed changes to the MC version structure.
Merge branch 'dev' into version_support
Now downloads the selected version.
Merge branch 'dev' into version_support

Conflicts:
	src/launcher/MultiMCLauncher.java
Implement shared lwjgl folder
Use Minecraft versions stored in config packs
Numerous improvements to instance creation.
Center forge download dialog on parent
Some easter egg tweaks and cleanups
Nuke obsolete update option
Snapshot dialog is dead! Long live the version change dialog!
Set intended and current jar version on downgrade to prevent reverts.
Properly identify and fix versions of downloaded forge archives.
Sort folder mod lists, move Modlist subclasses out of Instance.
Better openmp region
+ Add missing Parser functions
! Syntax error in Template
! Wrong class names in ExpressionParser
+ Add Function classes
+ Compile macro info in Module
! Source\File and Source\String were using CR line breaks

Signed-off-by: Steven Hoffman <git@fustrate.com>
Guestbook sparar till databas
Added a reticule for better picking.
Removed a remaining debug message.
final about
Changed 1 word.
Merge branch 'master' of github.com:GroundSix/curl
proper btagging switch
changed btagging
Merge branch 'master' of git://github.com/HEP-KBFI/stpol

Conflicts:
	CMSSW_5_3_4/src/SingleTopPolarization/Analysis/python/selection_step2_cfg.py
Add engine_name to engine.rb to fix install generator.
Bump version 1.0.1
Change in jobs
changed constructor/destructor of loader, added plugin dir
ACCENTS date block
Front feature fix (80)
Release v0.1.2

Improved DiacriticCleaner (using unicode normalized decomposition,
fixed wrong translations)
Match 18th century 4-digits years
Added all Pathfinding files
Nelaro: datetime lib hinzugefügt
[Fix] Path to image was incorrect. Resulted in absolute local paths being rendered.
Merge branch 'BandAids' of https://github.com/Jebtrix/fabrik into BandAids
pos_github
Added a resource_path helper method to return unpacked file paths. partly solves #12
añadiendo PHttpServer
Terminado pruebaStream
Escribiendo ficheros en el OutputStream del Socket en PHttpServer
Daily commit.
Wizard is now usable. Still needs team creation if teams are created with it.
Modified Tournament and TournamentDatabase to be able to use the new style.
Added stuff for more usable css buttons creation.
Added SongTest.java (not complete), testRemoveChannel() fails
cleaned unused modules
Add a os::path::working_directory method
Merge branch 'master' of https://github.com/Kazade/kazbase
Fix d'un bug d'affichage de notification
Ajout de l'admin des legions
Affichage de l'image
Merge pull request #53 from Kamule42/master

[Légion] administration
Prise en compte du bonus d'affi
update translations

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
update Brazilian Portuguese translation
Merge pull request #31 from elder/master

Update Brazilian Portuguese translation
build: switch to automake 1.12 and autoconf 2.69

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
libgpaste: add static method to list histories

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpasted: add ListHistories

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpaste: add list-histories

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
generate ChangeLog only since 2.2.1

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
temporary rework gpaste-client handling for vala stuff

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Merge branch 'master' into HEAD

* master:
  temporary rework gpaste-client handling for vala stuff
  generate ChangeLog only since 2.2.1
  build: switch to automake 1.12 and autoconf 2.69
  update Brazilian Portuguese translation
  update translations

Conflicts:
	src/gpaste.vala
update gpaste-client.vala

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpaste-settings: add multi-history settings

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
libgpaste: create history file if doesn't exist

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpaste-settings: regen histories list when needed

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpaste-settings: report errors

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpaste-settings: update backup name according current history

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
libgpaste: emit changed signal when loading

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
libgpaste: move switch and delete stuff to GPasteHistory

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpasted: use new GPasteHistory stuff

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
gpasted: fallback history

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
segment by topic for accuracy_deltas table in hive

Summary:
It's a little meaningless to just see incremental gains of students who
have done exactly X stacks across all topics, since there are topics that can be
completed in 2 stacks and topics which have more than 16 skills.

Also, the final table to which the reducer writes is now partitioned as
a labelling mechanism, as @benkomalo did for some video summary tables. This
eliminates the need to pass in a separate suffix argument to label the table
with the start and end dates which are already passed in.

Reviewers: tom, benkomalo

Reviewed By: benkomalo

CC: jace, yunfangjuan

Differential Revision: http://phabricator.khanacademy.org/D260
corr fix
Backup PATH_INFO into its own ENV variable for middleware processing.
Set background as transparent when uplifting tiles
Get storage data type from ext
Add buffer for postgis gdal source
Enable alpha channel while making color relief
Disable grid corp when rendering 1x1 meta tile (gdal don't support meta tile render because imagemagick/gil destroys geo info)
Change default values of renderer/server
Merge branch 'master' of https://github.com/Kotaimen/mason
layout navigation pour la navbar
Add solution to problem 439.
Remove existing database
resize swap upward significantly, add handling when no filesystem present and make sure the partition is unmounted when formatting
Merge branch 'master' of github.com:Lophilo/mkcard
documenting cw_setOfObjectsPassingTest:
cleaning up the documentation so it all is no longer than 80 characters wide
making sure to free the dispatch_queue_t when done with it
new api -[CWSerialBlockQueue addBlockOperation:]
Tank parts use part resource system
Use part resource system to manage Kethane, use old feeding algorithm
Moved static utility methods to Misc
Use resource system directly for drilling
Removed pump system (new resources system handles transferring)
Use stock PartModule instead of converter system
Dead code
Remove extraction UI in favor of event toggle
Remove debug dump function
Don't track or validate on Kethane tanks
Remove tank class
Dead code
Dead code
Create KethaneController vessel singleton
Get Vessel corresponding to this KethaneController
Removed texture busy flag logic
Formatting
Inline method SaveBodyMap
Move map save/load logic to KethaneController
Move DrawMap to KethaneController
fixito que rompe tu disco duro
Hice el codificador
merge
Set fields in Reservation class to null. Except length.
length = 0
Switch from java.util.Date (deprecated).
	To java.util.Calendar.
	Uses Calendar.set (int field, int value);
	
	Example Calendar.set (Calendar.MONTH, 3);
Almost first.
Adds TinyEditor to Mimas.

TinyEditor is a lightweight wysiwyg Editor created by Michael Leigeber.
Some 'Blue Sky'-Theme changes
Added a potental set of courses for bayesian network reasoning. The code
comes with an editor but that will most likely be reworked to use the
existing hoop graphing capabilities
JSODD: Better syntax error handling
MOSYNC-1564: Removed super-default rescompiler lib
JSODD: Reload command
JSODD: Added reload features to preference page
JSODD: Non-script HTML files no longer cause error message.
JSODD: Server prefs
JSODD: Even better syntax checking
Merge pull request #20 from mattiasbybro/master

Important pull request :)
Fixes #206 on relationships branch
[backend/ckan,bugfix][s]: map types better.
[build][xs]: regular build of js.
[docs][xs]: two small bugfixes - download link works with relative links and fix missing backtick in models.markdown.
Renamed all methods called `delete` to `remove`

This is because Internet Explorer <= 8 has `delete` as a reserved keyword that you cannot name your methods
Added fix js file for adding support for ECMA262-5 Array methods for browsers that don\'t support them
Re-built dist libs
Fixes for Internet Explorer 7 and its strict JSON object modelling
Fix to make clearfix work in Internet Explorer 7
Rebuilt dist
Merge pull request #237 from okfn/232-recline-ie-fixes

[ie fixes][s]: Internet Explorer 7 & 8 fixes - fixes #232.
[recline-deps][xs]: add facetviewer.
Merge branch 'master' of github.com:okfn/recline
[demos/search][m]: basic working search demo (more work needed!).
[facetviewer][xs]: minor tweaks to facetviewer to remove things that aren't generic.
[filter,refactor][s]: remove fieldType attribute on filters as can (and should) get fieldType from model if needed.

* fieldType is needed now as we parse values to specific type before doing filters
* needed to correct some tests for this change
[facetviewer][s]: change from dropdown and simplify styling plus make some minor fixes.
[demos/search][s]: minor refactoring of facets in sidebar and styling.
[docs/models][xs]: add date and datetime to list of types.
Merge remote-tracking branch 'upstream/master' into virtualmodel

Conflicts:
	_includes/recline-deps.html
	dist/recline.dataset.js
	dist/recline.js
	src/backend.memory.js
	src/model.js
merged upstream and resolved bug on actions
generic aggregation function added
Merge branch 'virtualmodel' of https://github.com/Moviri/recline into virtualmodel
fixes #16

Conflicts:
	dist/recline.dataset.js
	dist/recline.js
	src/virtualmodel.js
remove REE optimizations, switch to current env, remove obsolete services, switch to unicorn
MDL-34465 - lib - Replacing get_context_instance with context_XXXX::instance (group 8)
Update GDM3Setup source to 2012/12/24
Update GDM3setup packages to 2012/12/24
Suppression de la bordure des niveaux
Capture
topic storage
fix public method violation
ASGARD-1036 Show flags in region images
Merge pull request #181 from joesondow/ASGARD-1036-region-flags

ASGARD-1036 Show flags in region images
Added a bit more content, some comments and a few more config values.
More figures and decorators implemented, getShownModules in drawing and drawViolationsForShownModules in BaseController implemented
Implemented validation
tests for validation
Merge pull request #5 from stoke/develop

Validations
Include GPL Licence
Experimental METIS partitioner call
Add airfoil vector map example
Add airfoil HDF5 vector map example
Merge pull request #28 from OP2/airfoil-vector-maps

Airfoil vector indices

Add airfoil application variants using vector-valued indices:
* vector map example in airfoil/airfoil_vector
* HDF5 vector map example in airfoil/airfoil_hdf5_vector
edit order page
Fix onegroup list quota output
feature #1222: Add missing failure triggers, for some error conditions
Merge pull request #8 from PWx21/master

Little bit more
forgot Train class
V-0.1a

Creating the engine and testing testing filesharing.
added detection before output, make undefined to be "".
Pass the number of ports through **argv to the smem code generator binary
+ flushdb command
+ getrange command
add plugin fuzyfinder
Separados los test del código fuente
Instalación de dependencias de node mediante package.json
Nuevo widget visual para contar o descontar. Test para descontar e inicializar
Añadido evento de counter_changed + html para visualizar el widget
Remove the temporary directory when done
Вдох-выдох перед смертью ;)
Merge branch 'release/0.1.1'
Add SoundParticle

結構いい感じだと思う。
removed URL hiding support temporarily as it's breaking iOS scroll field on focus.
Facebook login passport
update package.json
google suche in suchfeld kopfleiste angebunden
Merge pull request #8 from Setekh/antro

Some careful refactoring done by Setekh.

Lights can now be removed and added to the DSP. 
Added a missing -1.
all the light types work now, but it still needs work done
Prevent accidental production-mode exception fall-through.
Merge pull request #444 from pvande/accidental_fallthrough

Prevent accidental production-mode exception fall-through.
Abstract worker status, add a stat
Merge branch 'master' of github.com:Singly/hallway
making proxy work for facebook, related to #358
Merge branch 'master' of github.com:Singly/hallway
implemented a maximum time step
Still playing with self-update
Still working on self-update stuff.
Update for SpoutAPI changes.

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Update for API-Components branch.

All but platform classes/WorldFiles compiles now.

Signed-off-by: Chris Sanders <zidane@outlook.com>
Use Bullet GL Transforms with entities with physics.

Bullet has its own graphics (interpolation) transforms from the motion
state. Instead of using our own, use bullet's instead.
Signed-off-by: Chris Sanders <zidane@outlook.com>
Fixed players not able to relogin. The logic that happens now is players are never removed (offlineplayer concept) and their ID is instead set to -1 in
deallocate of EntityManager. When re-logging in they are given a new ID. Also correctly fire EntitySpawn/DespawnEvents (Might need to ignore players in this...).
Signed-off-by: Chris Sanders <zidane@outlook.com>
Updated ZfcUserDoctrineOrm
Diverse Probleme behoben
Diverse Probleme behoben
AppModel update + componentklasses aangemaakt
url bar hides on mobile
Merge branch 'develop' of github.com:Swizec/melt.ee into develop
Performance ?
Added a note on template names
Fixing spammyness
Added MultiSalvaging
If there's not enough targets for the salvagers, activate them on already being salvaged wrecks
Should speed up salvaging the last few
Schwierigkeitsgrade eingebaut

- Versionsausgabe geändert / Version geändert in r4
- Alle Funktionen mit dem Prefix "MQ_" versehen
Leerzeichen hinzugefügt
Runden bei Eingabe des Schwierigkeitgrades entfernt
Leerzeichen entfernt
Texte für Schwierigkeitenauswahl und Co. hinzugefügt
Fix für L['MQ_START_VAR_X_Y']
Antwort- und Autoantwortmodus entfernt/auskommentiert

- letzte Überreste des Experimentmodus gelöscht
Versionupdate
merge
changed absolute + relative -> referenceType
made BC conversion available
added note in changelog
adapted Controller to the reference type
added scheme and method setter in RouteCollection
made schemes and methods available in YamlFileLoader
add missing format specifier to error log
remove warning
add popup select logic
Merge branch 'master' of github.com:TraceCN/nebula
AirspaceSorter: Replaced *Filter and *Compare classes by lambda functions
CProbe: Fixed temperature offset bug

As reported by forum user "archibald" <office@haider-zt.at> the C-Probe
is sending the temperature in Celsius and not in Kelvin. This conversion
was forgotten in the original implementation.
WaypointList: Simplified distance_filter_items list
Travis-ci for development branch
added input and output html
Fix files and delete broken ones
updated PKGBUILD with Makefile
Playing speed is now normal double
API call for changing playing speed
Start of Create Form
Added UNEP logo to list of partners in About page
corrected a syntax error + removed debug output
removed version comments, changed Navi class so we don't need multible
instances
Improve purity: reputation() method now _returns_ user and object reputation.
Beta implementation of weather service/parsing
Added debug manager.
Added the protocol of the engine
Eclipse
app::commande
paf :D
Merge pull request #90 from YueRen/gfanlib

Gfanlib
chg: install-libsingular should also install Singulars LIB
chg: gfan stuff changed
add iiOpsTwoChar (see iiTwoOps)a: overload operators for ewstruct
fix: typo
chg: help for modules should not consult the manual
chg: look up <arg1> <op> <arg2> also in arg2 bb table
fix: more templates for libfac
+To person
Implement CUDF task scheduler.
Conventions
Differences from the Web Platform
Avoiding paths becoming part of the filename for phing Windows users

For windows users that have paths with a back slash, you may experience the following when you upload a file:

http://i49.tinypic.com/fay5v6.png

For some reason, Amazon will make this part of the URL, so we simply need to change the back slash into a forward slash so that directories are preserved.
update gitignore and spec helper before to gitflow workflow
Add MprisFrontend that connects to D-Bus' SystemBus
Do not require 'readon' and 'status' fields on 'exit' messages
Add full support for org.mpris.MediaPlayer2 interface (not including TrackList and Player)
Run glib.threads_init() in addition to gobject.threads_init()
Add shell for player interface's properties
Add link to Ubuntu's sound menu docs
Trigger PropertiesChanged signal
Add the shell of the player interface with pseudo code
Merge branch 'develop' into feature/mpris-frontend
Send libindicate notifications when Mopidy starts and quits
Cleanup log messages
Log on all calls to dbus service methods
Merge branch 'develop' into feature/mpris-frontend
Reuse the common GObjectEventThread in the MPRIS frontend
Allow reply_to to not be set in messages to the MPD frontend
Made play/next/prev in Ubuntu's Sound Menu work by wiring the MPRIS methods to their MPD frontend equivalents #thisisatemporaryhacktoprovethatitworks #ipromise
Merge branch 'develop' into feature/mpris-frontend
Merge branch 'develop' into feature/mpris-frontend

Conflicts:
	data/mopidy.desktop
Merge branch 'develop' into feature/mpris-frontend

Conflicts:
	mopidy/core.py
	mopidy/frontends/mpd/__init__.py
Initial shot at updating the MPRIS backend for Pykka
removed a class
final changes done
Merge pull request #2 from samirgoswami/test

final changes done
decode file paths
Add/fix pursue and evade
Added basic interfaces to extend game elements.
only run tests on single port

since it needs to be hard-coded in the tests
adding some dev card stuff
adding a bit to readme
ortest: added new testing mode "l" for TEST_NGINX_CHECK_LEAK=1.
Clean up styles for pressed easing
Updated jsdav reference to 1.6
Bogus commit to trigger CI re-build
Merge pull request #2289 from ajaxorg/upgrade_jsdav

[Knuth] Upgrade jsdav to get latest jsftp
Console/logger shouldnt break when there is no txtConsole
Who needs comments
fixed issues with cancel upload queue
Merge pull request #1622 from ajaxorg/ftp_logger_errors

Console/logger shouldnt break when there is no txtConsole
Revisions should never touch Fs directly. It writes everything as root now.
Remove some tracing, and re-enable the path file
Try to fix revision tests, but dont think theyre adapted to the new saving mechanism
Update config to include sandbox.fs
Update run npm to not use fs directly anymore
Update settings to not use fs directly
Settings remove console.log
Nicer syntax this way
Update build core file
Merge branch 'master' of github.com:ajaxorg/cloud9
Delete console.log
Merge pull request #1628 from ajaxorg/revisions_root

Revisions likes to pretend to be root
Merge pull request #1629 from ajaxorg/fs_is_evil

Don't call fs directly from plugins
* add a check to fix issue with "Firefox threw 'tabPage' after refresh"
* fixes ajaxorg/cloud9infra#1427
WIP, simple concurrency bug detection
Removed the link to GitHub issues under Help->Support and the divider underneath.
Don't include "package" and "hidden" kinds in list of variables
Merge pull request #1693 from ajaxorg/fix/kinds-in-completion

Fix/kinds in completion
- Not making a call to `getemail` if we are in collar or OSS mode.
- Some syntax cleanup
topmenu save
Fix various UI, UX issues
DRY
Merge pull request #1203 from ajaxorg/ext/replaceall

Fix various UI, UX issues with replaceall/quicksearch
bntmnu css fix
fixed CTL_DATE and LGTWTTYP strings
NEWS: add hook calling order item
add ./project to gitignore
Modified a argument.
* rename readme to setuptools standard
* fix file name download
* mv tsantsa to setup dependency
* fix cpu reading
* rename readme file
* update i18n
painting a var_dump on prod!! fuck yeah!
avancement des tests
modif tag see
Merge branch 'master' of github.com:alan-mushi/TP3
can import methods that take blocks
Moving hiding app into trustedUI
add SIM PIN configuration
fix conflicts from master
Fixing Bug. Contacts list not refreshed after FB import
FB Regresh List Bug. Fixing Lints
FB. Refresh. First round of reviewers comments
Merge remote branch 'upstream/master' into fb_contacts_refresh
Fixing Test
fix conflict and comments from reviewer.
apply new dialog UI, but got some style problems.
merge master, fix conflict, and resolve style problem
MockExtFb file for FB testes
fix unlock sim card style and reuse code in simlock settings
fixed shortcuts in facebook import
[#4997] [email/activesync] Save the server info for faster startup
Merge pull request #5076 from crdlc/shorcutsFbImport

[Facebook] Bug fixed shortcuts in facebook import
Merge pull request #5077 from mozsquib/master

[#4997] [email/activesync] Save the server info for faster startup
update according to comment from review feedback
Merge pull request #4906 from evelynhung/simpin-v2

[Settings] add SIM PIN configuration
Addressing latest comment. Adding FB tests
Fixing lint and spureous debug messages
Moving vars to the suite scope
Missing definitions
Indent
Adding tests for contacts without name
fixes #11: client-desktop now shows contents of the torrent
update to imakewebthings-deck.js-069f632
fix whitespace in spec
style_theme and transition_theme options