labofsahil/github-event-dataset-2012 huggingface dataset:
removed unused attribute from routing.xsd
removed wrong routing xsd statement `mixed="true"`

mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
merged branch Tobion/patch-2 (PR #6166)

This PR was merged into the 2.0 branch.

Commits
-------

57edf56 removed wrong routing xsd statement `mixed="true"`

Discussion
----------

removed wrong routing xsd statement `mixed="true"`

mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
needs to use simpleContent in xsd to allow empty elements
Merge branch '2.0' into 2.1

* 2.0:
  [TwigBundle] Moved the registration of the app global to the environment
  needs to use simpleContent in xsd to allow empty elements
  bumped Symfony version to 2.0.19-DEV
  removed wrong routing xsd statement `mixed="true"`
  removed unused attribute from routing.xsd
  updated VERSION for 2.0.19
  update CONTRIBUTORS for 2.0.19
  updated CHANGELOG for 2.0.19

Conflicts:
	CONTRIBUTORS.md
	src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
	src/Symfony/Bundle/TwigBundle/TwigEngine.php
	src/Symfony/Component/HttpKernel/Kernel.php
Merge branch '2.1'

* 2.1:
  [TwigBundle] Moved the registration of the app global to the environment
  needs to use simpleContent in xsd to allow empty elements
  bumped Symfony version to 2.1.5-DEV
  bumped Symfony version to 2.0.19-DEV
  removed wrong routing xsd statement `mixed="true"`
  removed unused attribute from routing.xsd
  [HttpFoundation] added a small comment about the meaning of Request::hasSession() as this is a recurrent question (refs #4541)
  updated VERSION for 2.1.4
  updated CHANGELOG for 2.1.4
  updated VERSION for 2.0.19
  update CONTRIBUTORS for 2.0.19
  updated CHANGELOG for 2.0.19

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
345.02 DO NOT USE - still testing optimizations
- add graphItem observer
- fix several bugs
- update demo
Merge branch 'master' of https://github.com/sysord/Graphvis.git
man: add missing man page
build-sys: Append -Werror when testing flags

Clang don't treat unknown warnings flags as an error, but rather as a
warning. The result is that the detection for whic CFLAGS are supported
by this compiler will not work, since the compilation will succeed.

With this patch we now successfully detect clang doesn't support
-Wlogical-op, as opposed to previous behavior:

	checking if clang supports flag -Wlogical-op in envvar CFLAGS... no

We use this macro only for LDFLAGS and CFLAGS, so it's safe to stash
-Werror there.
Fix: some compilation errors
IMPL PullUpRefactoring
- add: processor, trait, test and test-cases for PullUpRefactoring
- modify: some entities for attaching RSTPullUp trait
- note: test-cases are inadequate.
recovery comment button click event
audiotools: all2: fixing for file paths with [ and ]
more vim-like history characters
Added initial incomplete version of 2006 party poker limit format
Updated README to point to upcoming Go version.
Added functions for quick network creation using remote nodes
push to github as well
fix some code smell

no good modifying greenhouse configuration at import time. that behavior
of turning off EINTR isn't important until the monitor is actually
listening for signals.
Ensure the state is only mutated by one behaviour representation at a time (partial check in).
Added support for modifying an encapsulator via a builder.
Cleaned up stateBuilderImpl.
Make sure the state is set in value.getState.
removed lingering directory to readd as submodule.
added ace-jump submodule and removed unused fuzzy/popup dirs
Fix memory leaks.

- Replace malloced C string with C++ string.
- Use snprintf instead of sprintf.
Remove pdepend/pdepend. Not using it atm.
Added more error handling to Stats page
reordering aplication layout
2badboo2
Enviando o projeto
caching for Cms::get() activated
test internal define
`define` can now define functions, and a lexer bug
the let macro
a long but somewhat clear impl of `select`, fixed the bug with unary `-` btw
added primitives for type-testing and symbol-handling
added grinch to monument
Merge branch 'master-2' of https://github.com/timclayton/hc12 into master1
uncommented part of stopSceneAudio function
Remove unnecessary document check in the main Sizzle function
Add :lang support. Close gh-178.
Added coverage.properties
XMLIndent function. some cleanup.
日本語入力切り替えの問題に対応
zshのviキーバインドやめ！
owner name and full title
Add feature comparison to documentation and tidy. Add check abd message for presence of HTMLUnit.
Add note about encoding
Soften colours
my eclipse metadata
Released version 0.12
Released version 0.13
Merge branch 'master' of github.com:ingydotnet/moos-pm
major bugfix that caused some queries to deadlock
モジュール集に要素を追加、他
- フォーム系要素追加
- 注意喚起ユニット追加
- form要素をinlineにした。
- 画像を使用するサンプルに、サンプル画像を当てた。

このリビジョンで、予定されていたモジュールが仮に一旦出揃った。細部の設計は引き続きツメていく。
mods to enable contour label frequency control
Notepads management
Fixed the day1 exercise2 query so that it doesn't work by co-incidence
simple wook exemple
* Fully working sliders and slider targets.
* WgGizmoValue and WgGizmoEditvalue are now slider targets.
* First checkin of (non-compilable) WgGizmoMenu.
* Fixed bugs in WgGizmoStack geometry.
Merge branch 'master' of github.com:tordj/WonderGUI
ignore non images and images without optimisers when recursing
warn if directly added files are not images or are not optimizable
v0.6.0
changed slopes of MF. gives galaxies a neat blue tint
put logfile name in mpstate for modules to use
camera: save aircraft state and images in camera directory below logs
support auto-protocol on slaves
use priority to download jquery, config and troopjs-bundle in parallel
show/hide history temporary works from menu
First downloaded and unzipped file, Colossal Adventure, for now used
hardcoded paths in web and sdcard.
unified folder that taking unzipped file
SAASBASE-1672 - Modify metrics for query-level logging
Fixed copy-paste error.
Exposed timers and counters in RequestRecord.
Exposed RollingRecord through built-in reporters. JMX is the important one.
Weeded out the total requests counter.
Refactored average meter method name incongruency.
Merge pull request #2 from tscurtu/SAABSASE-1672

SAASBASE-1672 - Modify metrics for query-level logging
Fix commit '049452f089ba2df8312506dd85649a90415e64bd'

Fix a previous commit that broke sign-extension in the EX stage.
removendo node_modules do gitignore
atualizando documentação
Add an alternative to Enumerable#concurrent_map which can limit how many threads are used
Provide proper amount of padding for ipv4 addresses in Pool#summary
Ignore duplicate listings in SHOW PROCESSLIST when probing slaves for a node
Fixed for using ControlPoint::Device on its own
Project rename
Project rename additions
Tiny tweaks to readme.
Change the cmd-line printing option to dump to file.

Unfortunately it's impossible to guarantee that other prints aren't
happening too, which will gum up the output.
Change the cmd-line printing option to dump to file.

Unfortunately it's impossible to guarantee that other prints aren't
happening too, which will gum up the output.
Address code review comments.
Merge remote-tracking branch 'forked/master'

Conflicts:
	src/python/twitter/pants/tasks/binary_utils.py
	src/python/twitter/pants/tasks/jvm_run.py
Merge pull request #47 from benjyw/master

Change the cmd-line printing option to dump to a file.
With pam_url > 0.3, you no longer need to concat

Make a change since you no longer need to concat the certs together
for pam_url >= 0.3.
Prepare for 0.5.4
Add generic puppet module for quickstart.

The default configuration will use tokens only.
Ignore body process option provided in ReceiveMessage
from at-home-modifier, the life changing item http://gitorious.org/at-home-modifier
SingleCompile update.
Added AutoPairs configuration.
anchor link in api page
[NEW] Allow a non-main entry function.

Before this update, the compiler enforces the existence of a function called
"main", because

1) Otherwise, all functions are deleted in Dead Function Elimination
   (IPA_Enable_DFE is turned on by default), and

2) The OpenCL backend inserts clInit to this main function.

Now we want to add support for compiling library code, i.e., when the main
function is not present.

The first usage of main can be resolved by simply disabling DFE. An
alternative would be to mark a non-main function, provided by the user, as
IPA_NODE::Is_Externally_Callable. This non-main function must in turn call all
other externally callable functions in the source files. This approach is too
messy.

The second usage of main is not really an issue. If there is no main function,
the clInit call is not generated anywhere and must be present externally.

For convenience, we add an optional command-line argument -e <entry_name> so
that the user can mark a non-main function to be the entry point. The only
consequence of this action is that, in the generated code, the entry point
will contain the clInit call. This is achieved by:

1) Adding an internal option to the IPA module: -IPA:entry in config_ipa.*,
   and updating the hicuda driver script to use this option,

2) Replacing explicit references to "main" in IPA to
   IPA_HC_Entry_Function_Name, which is set by the new option.

3) Removing a special treatment for printing the name of the main function in
   st2c.cxx.

A regression test case HTF014 is added.
[FIX] Removed a temp file in regression test HTF004.
Merge branch 'davidtyh'
Doxy comments.
Merge branch 'master' of github.com:updraft/updraft
Weft treadle now defaults to 0, not null
Added renderJson() method, and 'x' and 'y' properties to the individual cells of the drawdown data
Updated README to require PHP 5.2 (for json_encode())
Fixed JSON drawdown render logic
Added support for returning an image (for example a tiled preview) along with JSON drawdown data
Method tweaks and new renderJson method
Merge branch '1.x'
Secure PinPad Idea
Secure PinPad Idea  - keyboard layout 1
Secure PinPad Idea  - keyboard layout 2
Secure PinPad Idea  - keyboard layout 3
Secure PinPad Idea  - keyboard layout 3
Secure PinPad Idea  - keyboard layout 3
Merge branch 'master' of https://github.com/usulaco/spinpad.git
Small bugfix in plan_vacuum
Update nav,  added language changing
modified:   ../../fetch.py
Fix details page link
deploy fix to put uploads in simlink on shared folder
Forgot to add some core command modules when migrated from SVN.
changes in naming and checking name of files and fields in database
neo4j
messing around with embedded docs
begin embedded documents and atomic modifiers
removing flex display and fixing camelcase JS Bug
adjusted scratch logic to start higher bench priority first shuffle
and then replace remaining positions
Fixed layout problem with non fullscreen mode in mobile browsers. Fixed bug in firefox where json was recieved as text by js. Changed color of undo toggle pressed. and other minor fixes that i don't remember.
Break compiler dependency from util/collection.
not really stuff
Fleshing out article with photos
Add a git function to see a cumulative diff over one or more commits
chaning some config
Update README.md
Merge pull request #14 from divergentdave/readme2

Awesome thanks!
FEMTI FEMTI FEMTI FEMTI
switch to a udev rule for pci power management
switch to udev rules for usb power management
update PKGBUILD
Merge pull request #4 from thestinger/rules

switch to udev rules for usb and pci power management
Rollback MSGPACK to v0.5.6 (from 0.5.7) since LLVM-GCC segfaults on Lion.  Continue boost build regardless of errors.
Integrate plugins and repo
Change font weight of emolett to normal.
Rename yaml_libyaml to yaml_nif
Add compile setting
Ignore rebar file
Add Makefile
Generate index based on internal champion list instead of from
leagueoflegends.com
Delete aptana project.  It's been broken for 2 years.
Test smoke Ecms_demo 2.3.x
第二回講義の情報と参考図書の情報を追加
Images
Merge pull request #33 from walmartlabs/user/eran

Images
Merge pull request #34 from walmartlabs/develop

Develop
latest jquery calendar fix
attempt to add ie9 support for elated teeth
fix compatiblity issues with other plugins which add rewrite rules
change widgets to use <section> instead of <article> - see #379
Remove hidden US +1 Telephone Field
Merge pull request #391 from ntwb/master

Fix vCard widget for international support
Merge pull request #380 from ChrisClayton/patch-4

Change widgets to use <section> instead of <article>
Fix #377 - Add missing 'active' class with current_page_parent
Fix #374 - Media query at bottom of app.css needs max-width of 979px
Restore duplicate subfolder removal
Merge pull request #340 from maff/rewriterulesfix

Fix compatiblity issues with other plugins which add rewrite rules
Fix #357 - H5BP htaccess missing on older PHP installs
Updated Brazilian Portuguese language files from new .pot file
Merge pull request #393 from weslly/master

Update Brazilian Portuguese language files from new .pot file
Fix #335 - Update to Bootstrap 2.0.2
Merge branch 'master' of github.com:retlehs/roots
Fix #347 - Properly enqueue stylesheets
Fix #348 - Temporarily remove Gravity Forms customizations
Fix #353 - Add conditional feed link, thanks @zslabs
Fix #392 - Small tweak to root relative cleanup
Fix #366 - Remove conflict with custom nav walkers
Google Analytics automatically tracks load time
> command line documentation
use ClassLoader to load Classes & Packages.
unlimited version of upload
Update WhoPaid.py

hide details
Deleted ZFSkeletonApp
Revert "Initial commit"

This reverts commit b424b9ad55cf07ba07728dc0562b6eb27c529ab2.
Use content snippet ['footer_left'] for left side of footer - admin user can edit
manifest.yml now ready for automatic deployment of /web
Remove requires in delayed jobs raketask.
Revert "update"

This reverts commit bdffc687bf34979bbde48a97a548e8be86e1478f.
Merge branch 'master' of github.com:williamjxj/dixi
Merge branch 'master' of github.com:williamjxj/dixi
update
update
added contents and readme
fixed docs
added testing for contents
modificacion en models y divisiones para que se muestre el resultado en la tabla de problemas
update jinja syntax file
add custom jinja snippets file
assume *.html files are jinja templates
remove silly snippet test function
define a bunch of basic jinja snippets
Merge branch 'master' of github.com:wilsaj/dotfiles
add vim plugin: zencoding-vim
Zsh: force SHELL

On Mac OS X, $SHELL is being set to /bin/bash despite the fact that
`chsh` confirms my shell is /usr/bin/zsh. This in turn means that tmux
runs bash every time I try to create a new window.

Forceably set $SHELL on startup, which in turn makes tmux do the right
thing.

Signed-off-by: Wincent Colaiuta <win@wincent.com>
further comments in Readme
commit to sync
pull from master
remove picture file
Merge pull request #28 from wkkp/master

pull from master
show results of competition, add system preferences page
fix error
erase button from admin home
fix merge
增加转换红黑树到图形文件的功能

优化vrumtime的计算，使用了graphviz的lib完成了图形转换功能
Added no comment
Upgrading to Codeigniter 2.1.1
fix 1.8 issue
add 1 more example, restructure
UI框架改用RCP
对Color进行缓存以提高性能
解决产品发布的乱码问题
NewSession页面编码方式可选，并增加配置选择
增加重新连线和断开连线的功能
重新连接和断开连接的状态跟随editor变化
新增IConnectionStateListener，调整IMudClient接口
重连、断线的Action的enable状态跟随当前editor的状态变化
增加disable时的图片
增加#reconnect和#disconnect指令
增加#echo和#show指令
当连接成功和断开连接时会自动调onConnected和onDisconnected的alias
提供默认的自动重连的脚本
IExecution都在工作线程中运行
增加了#var的临时变量指令
增加了角色视图的加载机制
增加对变量的监听功能及#watch和#unwatch指令
pkuxkx的角色视图实现
SimpleTrigger现在支持多行正则匹配
支持选择是否在工作线程中执行
发送到服务器的指令可以选择是否回显
增加Capture类配合Trigger使用可以隐藏一段文本
增加loop指令
Add numpad keys support
(examples/_test/basetest/main.cpp): fix mismatching allocation/deallocation
(main/ogg/stb_vorbis.h): remove invalid free() of stack memory
(wz4frlib/wz3_bitmap_code.cpp): fix memory leak of "qq" variable
(altona/main/util/bitio.cpp): fix memleak of 'codes' in sFastHuffmanDecoder::Init()
(altona/examples/_graphics/screenmode/main.hpp): move LINE_MAX to end of enum

keeping LINE_MAX before LINE_OVERSIZE & co. causes a bunch of
out-of-bounds array manipulations in main.cpp for 'Settings', 'SetMax',
'SetString' and 'SetLabel'.
Merge pull request #23 from png85/wz4.leakfix

wz4 memory-related fixes
makeproject: Need to use user-specified code root for .props files, sCONFIG_CODEROOT is hardwired at makeproject compile time which is bogus.
Wz3/Wz4/Altona: Update .gitignore files
Make building out of the box a lot easier.

makeproject:
- Add new AltonaRoot property to generated project files.
- Output paths to .props files relative to $(AltonaRoot)

build .props:
- Specify path to asc/wz4ops relative to $(AltonaRoot) (no need to add altona\bin directory to your path or anything like that anymore)
Update README
Merge branch 'master' of github.com:farbrausch/fr_public
Merge branch 'numpadkeys' of https://github.com/wzman/fr_public into wzman-numpadkeys
Wz3: No need to define extra sKEY constants for printable ASCII chars
Wz3: Fix a bunch of warnings
Add data files for 'The Cube'
Wz3 Wavefront loader: Add some missing commands and deal with missing normals/texture coords in GenMinMesh interface
wz3: Default-initialize master viewport in GenOverlay to fix Render/RenderAuto crash
Wz4: Example.wz4 added
Wz4: Disable (currently unused) MIDI handler to work around driver issues
altona: quick vs2012 fix

- Compiles under VS2012 (Express for Desktop w/ SDK 8.0) now
- Yay for x64 :)
- Just set the VS version in altona_config.hpp to "2012"
screens4: siegmeister fix
vs2012 fixes, cleanups, new bins

- fixed vs2012 library order and flags
- wz4 v.201, fresh new binaries (plus x64)
- cleanups
altona: x64 fixes
Add %TRACKNUMINPLAYLIST% pattern translation to get track.PlayOrderIndex
Add 'playorder-flat' sync pattern for %TRACKNUMINPLAYLIST%
added leading zeroes to PlayOrderIndex
update TranslateTrackNumberInPlaylist definition
master mapping now visualized
ололо
Описал
1234
Готов MagicSquare
Перед слиянием
Отчетная точка

отсюда можно ответвляться
2012/07/28 스터디 업데이트

io_delay 분석
mutex, acpi
Merge branch 'master' of github.com:x86-8/linux-3.2
initial commit for app files
afegit l'enllaç de la llicència a la pàgina principal
CA-81362: raise the correct error when the destination address cannot be contacted

Signed-off-by: Thomas Gazagnaire <thomas.gazagnaire@ocamlpro.com>
Merge commit 'e5488a18d88e62d8130e482ea431c3904a007021'
CA-76727: avoid garbling storage backend errors
CA-91416: Remove set-dom0-memory-target-from-packs.

Signed-off-by: Jerome Maloberti <jerome.maloberti@citrix.com>
Merge pull request #946 from jeromemaloberti/CA-91416

CA-91416: Remove set-dom0-memory-target-from-packs.
panel
sta
Last big commit. Small steps from now on.
Implemented touch input.
Added, removed and changed various object manipulation functions.
增加php配置
sergio is lazy 
:)
Remove warnings from R tests.
And better docs on running tests.
add container style select
Bumped version number to 0.2.2.238. #244
タグ名をアーカイブ名に利用しないようにした. #244
reference.xml の Copyright を LEGAL.md に追加. #244
0.2.2.238 のリリースノート追加. #244
リリースノートの typo 修正、コメント追加. #244
リリースノート更新. #244
リリースノート更新. #244
リリースノート更新. #244
リリースノート更新. #244
Merge branch 'release/v0.2.2.238'. #244
Merge branch 'release/v0.2.2.238' into develop. #244
Merge branch 'master' into develop. #244
webtacka.net
added min-height to .multiselect-check (Tag container)
Add ; to avoid false alarm of require.
Use can instead of direct symbol table access.
Update name of test
* add Model&ModelX
* add simple auth part
* add several model files
First add of PHP version. Removed a sys out message in Android version.
remove a mutex
Added the proper LaTeX support for emacs.
small changes
refine batch configuration
Game cleanup.
Some minor restructuring and cleanup.
Reformat the headers
- add custom color picker(spector)
Remove unnecessary UIColor categories
Install markdown syntax
changed readme to include installation instructions
(#14343) Test case for another form of lookup

This test ensures that topscope variable lookup works when inheriting
from a fully qualified class name.
configuring for production deployment.
ready
fix and change
segconv.py
oh,no . big BUG about average. Fixed
nothing
sp.hpp
Merge branch 'nothing'
Register button styling:
- Removed styles for <a> tag
+ Added input into <a> tag
~ Renamed .submit class into .button class
~ Modified margin styles for .button class
Registers for and receives push notifications
Added unit test for Opera 9.2 on Windows Vista.
arrumado bug de cor
close #3
Allow building docs using the makefile
Merge pull request #122 from zoombody/fixes

Fix redirect to home page after open signup
Fix collection summary padding, closes #43
Can't share a collection on Pinterest
No more quarter-width columns
Some more fields are required, compensate for when it's not there
deps: new webmachine, gen_smtp submodule commits
core: fix for port selection when switching back to http.
加入设计模式
add tmuxinator into bashrc
mise en place des pages de soins
ListBox Item extension.
Pataisyta DUK nuorodos klaida
Pataisyta DUK nuorodos klaida
remove rouw-fluid from layout
config_class
Merge branch 'master' of github.com:4otaku/framework
config_class
mono
mono
mono
special case for multi within a pipelined block
Update notes for submitted changes

* enable tracing on aosp latinime
Preparação para mostrar pro Cas

Retirado o cyan (mapChanger) e o magenta (wall) do draw, exibido o
contador de mortes e projéteis disparados no CanvasResult e música
configurada para tocar no menu.
次奥啊，分页终于正常了。
新建广告部分Action
Merge branch 'master' of github.com:AdoHe/AdsDeliver

Conflicts:
	AdsDeliver_Server/WebRoot/WEB-INF/applicationContext.xml
	AdsDeliver_Server/WebRoot/WEB-INF/jsp/records.jsp

合并冲突，并注册了新建广告Action
Hard example
Merge branch 'zhansf' of https://github.com/AlphaHo/training.git into Ming_MS
Merge branch 'master' of https://github.com/AlphaHo/training.git into Ming_MS
2012年6月13日个人日志
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>
12 13日志

Signed-off-by: hshucai <hshucai@163.com>
Merge branch 'master' of https://github.com/AlphaHo/training.git
Merge branch 'alpha' of https://github.com/AlphaHo/training.git
Merge branch 'hshcuai' of https://github.com/AlphaHo/training.git
Merge branch 'Ming_MS' of https://github.com/AlphaHo/training.git
filling patterns are glued to zone center
add: probability relations among spaces
dthsh
Merge branch 'master' of github.com:Archerion/Team-3
Use designtime background brush (stolen from the Core project)
Fix the layout of the paste view.
Add a behavior for declaring VSM state transitions declaratively in XAML. Use it in LoginView.
LZO support added.
[12046] Fix an error with debug output for MoveFall. Thx to stfx for pointing
Fixup recent commit :( thx for pointing
(#15975) Add tests for http methods that accept blocks

This commit does the following:

* Add support for passing a block to the #request_post method
* Adds tests that verify that blocks are properly yielded to for
  the methods that do accept them.
Merge branch 'maint/3.x/15975_add_tests_for_request_methods' into 3.x

* maint/3.x/15975_add_tests_for_request_methods:
  (#15975) Add tests for http methods that accept blocks
Merge branch '3.x'

* 3.x:
  (#15975) Add tests for http methods that accept blocks
sending score only on update
update scores only if score has changed
fixes #15, code clean up
add more ignoring of vim swap files
Basic framework that prints genres/subgenres
Remove some more unused bits.
[Change] baidu.lang.decontrol() 接口
Merge pull request #118 from huangfangrong/dev

[Change] baidu.lang.decontrol() 接口
Impression factu / Correction Service Commande / Ajout Service Ecran factu
criado header_user
custom home menu labels
removed cdcase button
only visible when tagline/tvshow label is visible
no need for extra code
fix for alt classic widget layout
reduce file size for screenhshots folder
Merge pull request #325 from MartijnKaijser/master

reduce file size for screenhshots folder
new widget style system (weather missing atm)
Actually adding in travis configuration file this time.
digitalnz working
merge
Fix nameplate healer icons to display for mistweavers.
Still didn't fix consolidated buffs bug this should do it.
Attempt to fix the Bonus Roll frame jumping from top to bottom of screen.
Skin BonusRollFrame
Version 4.51
Add a few missing spell ids.
reposition BossButton and AltPowerBar
Merge branch 'master' of git://tukui.org/ElvUI
Aktuális napi adatok mentése -első működő képes változat. Kommentelve.
StockDataManager get függvényei direkt hiányoznak. (Visszatérési értékük
implementáció logikai hibája miatt nem ismert.) ->> Issues
Merge pull request #5 from Ki-csen/master

Aktuális napi adatok mentése
ServerSettings singleton, Upload corrections.
Merge branch 'master' of https://github.com/gyulanemeth/ITK-Stock.git

Conflicts:
	.classpath
package szerkezet updatelve, serversettings - elvileg - mindenhova
bekötve.
Kisebb módosítások + client package bevezetése.
Replacing javac.util.Pair with homebrewed Pair
Merge pull request #1 from Botffy/master

Házi feladat
jofbe helyett commitolok... bakker.
From a different comp.
Modified SQLCommands;
Merge pull request #2 from Botffy/master

StockTime dolgok
Moved sessions controller to its namespace
Updated README to match the repo.
Using switcher to change pages.
_gasTrackDoubleClick hook
README _gasTrackDoubleClick + param update
safer defaults for _gasTrackDoubleClick
Merge branch 'doubleclick' of https://github.com/tomfuertes/gas into develop
Made sure the right close timeout is used
after registration, upload dialog box is came
removed some remaining obsolete xstream references
adding empty elements and validation tests
chan.py
Windows: Removed forking, x64 support
Windows: In-depth cleanup (see details)
Included changes:
-Fix x64 builds for Windows. Now all configurations compile.
-Remove the non-working rebase stuff.
-Remove the Windows fork hack and instead use FreeConsole() to emulate the behavior. This directly allows us to compile with ASLR, which is turned on now.
-Remove the old GUI IPC mechanism. This is not needed anymore.
-Remove the WIN32/WINDOWS macros. _WIN32 is supported on all x86-based VC++ targets, so that's what we need.
-Enable optimizations for release builds.
-De-duplicate printf_c(), it was previously copy-pasted into colors.h for configure
-Add the VC++ specific bad files in .gitignore
-Disable PID writing on Windows. This is only making sense for *nix builds.
-Replace the CPU usage retrieval with an algorithm analogous to the *nix behavior. Also supports separated now/total values. (Tested with a dummy busy loop - seems working)
-Removed certain unused functions and variables
-Replaced random/srandom with inline functions instead of exports, so this doesn't add overhead
-Remove stdint defines from the windows wrapper
-Remove CRT debug alloc. This is a bad idea as it would define a macro to replace free which breaks builds.
-Re-evaluated the warnings list, commented it.
support for download of test while bootstraping
test
xadasd
Merge remote-tracking branch 'origin/Pernik' into kysel
Merge pull request #1 from Clobrdo/kysel

Kysel
Pulled fixed version of suggest.py from upstream (fixed by stoneLeaf)
Disabling scrolling should now immediately hide the scrollers instead of waiting for a content offset change.
Missing iOS 3.2 MPMoviePlayer methods and properties

prepareToPlay
backgroundView
shouldAutoplay
Merge pull request #86 from robotmedia/pull_request

Missing iOS 3.2 MPMoviePlayer methods and properties
Added UIColor.isEqual
Merge pull request #87 from robotmedia/pull_request

Added UIColor.isEqual
AVAudioPlayer bug fix: audioPlayerDidFinishPlaying shouldn't be called on stop
Merge pull request #88 from robotmedia/pull_request

AVAudioPlayer bug fix: audioPlayerDidFinishPlaying shouldn't be called on stop
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into Upstream
Merge
New option -d FILE FILE2 and print if -d FILE
Fix bug for winamax tournament with «Ticket only» entry
Improved RSS and NowPlaying visibility and animations
Correcting bug for filling curves which differs from stroke (scale pb corrected)
Merge pull request #355 from kerautret/smallBugInFillPolyline

Correcting bug for filling curves which differs from stroke (scale pb corrected)
Fixing DGtalConfig warnings and issues when building DGtalTools
Fixing DGtalConfig
Fixing linking on build tree
Merge pull request #342 from dcoeurjo/DGtalConfig

Fixing DGtalConfig warnings and issues when building DGtalTools
gemfile bundle update
added pg gem for heroku
postgresql installed over sqlite
Fixed Structure Growth Logging (No longer just the sapling block)
Update templates/js/atk4_univ.js

Forgot situation when there is no callback function given in parameters.
room rehash
balanced avatars
Added beatmaker xaml
Update test with changed order of panels
修复了1024*768用户文章内容页的bug
anglais complet
Prettifier
Issue #61 close:
	- Nouveaux fichier data avec le contenu du texte crypté
	- Fait en sorte que le texte crypté une fois le décryptage
	  terminé s'affiche correctement (en entier et sans répétition)
correct spelling

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5912 8aca7d54-2c30-db11-9de9-000461428c89
update squirrel_types.awk

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5913 8aca7d54-2c30-db11-9de9-000461428c89
FIX: map rotation speed when loading maps saved rotated

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5914 8aca7d54-2c30-db11-9de9-000461428c89
FIX: powerline usage display overflow

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5915 8aca7d54-2c30-db11-9de9-000461428c89
FIX: remove label signs of bankrupt players

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5916 8aca7d54-2c30-db11-9de9-000461428c89
CHG: proper support for non-rectangularly shaped factories, no dummy (0,0)-tiles

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5917 8aca7d54-2c30-db11-9de9-000461428c89
CHG: rotate freight coordinates after rotating factories to ensure unique target coordinates

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5918 8aca7d54-2c30-db11-9de9-000461428c89
FIX: checksum takes into account whether tile has image or not

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5919 8aca7d54-2c30-db11-9de9-000461428c89
CHANGE: better profiling

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5920 8aca7d54-2c30-db11-9de9-000461428c89
ADD: buffered multithreaded loading and saving

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5921 8aca7d54-2c30-db11-9de9-000461428c89
FIX: do not trigger assertion if broken building is clicked

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5922 8aca7d54-2c30-db11-9de9-000461428c89
no need to go through special rotation code for 1x1 factory buildings

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5923 8aca7d54-2c30-db11-9de9-000461428c89
ADD: support for non-rectangular shaped station extensions, attractions, monuments

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5924 8aca7d54-2c30-db11-9de9-000461428c89
FIX: routing information was sometimes not recalculated after loading

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5925 8aca7d54-2c30-db11-9de9-000461428c89
FIX: retrun image_id insteal of player color

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5926 8aca7d54-2c30-db11-9de9-000461428c89
FIX: retrun image_id insteal of player color

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5927 8aca7d54-2c30-db11-9de9-000461428c89
squelch compiler warnings

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5928 8aca7d54-2c30-db11-9de9-000461428c89
CHG: Allow to connect to channels built be anyone

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5929 8aca7d54-2c30-db11-9de9-000461428c89
Only use verkaufen string

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5930 8aca7d54-2c30-db11-9de9-000461428c89
Added some code which may fix overflowing ticks

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@5931 8aca7d54-2c30-db11-9de9-000461428c89
[19] - fixed bug where it was impossible to leave connection dialog on failure connect attempt
     - changed used driver to QODBC3
     - fixed bug in logging where < and > doesn't properly show
Readme updated yet again
#93 crazy killer now doesn't have dirt removed when assigned
#102 new holding world layout in place
slide menu bug fix

- stuck when trying to drag to a empty page
everall добавлен
Create tests module in catalog app
Add catalog to INSTALLED_APPS
Rename classes with uppercase to be more hipster
Add categories to catalog
Enable admin control panel
Add unicode method to models
Merge branch 'v0.0a-catalog' into v0.0a-admin
Add catalog view/url structure
Product, ProductCategory, Vendor info JSON
Merge branch 'v0.0a-catalog' into v0.0a-admin
Merge branch 'v0.0a' for first beta deploy
Modified destruction collisions and fixed level resetting.
Added sprite.lua

Also changed system.lua to support new component calls
Removed lies from the readme.
:trollface: updated at 2012-07-27T10:09:54+08:00
Clear progect fix bugs
the static way of stylish apiguide. Next step is the dynamic way.
CSS revert
gz-10: Renamed the git_confirm function to git_oauth_confirm.
some map configs
moos subscriptions put into mission file parsing
updated live_NCAT
finished mysql level fast alter table judge,for merge with Innodb level
Merge remote-tracking branch 'origin/master'

Conflicts:
	sql/sql_table.cc
Fix error in image check.
Slight doc change

Updated line 203 in scaffolding.html under docs to reflect what is
actually happening in the example.
Revert "Mudança no Nme"

This reverts commit 4238f01cc6fbeeaa3bdc727880c853f3f443ffc4.
Revert "Revert "Mudança no Nme""

This reverts commit b0a65c755d947c8055c6f44101dcb5b1aeddbcc5.
Updated autoOpen.c for Windows
Can create scripts to control stuff
Pagination works.
replace p tag with div

replace p tag with div because all product description are in a
paragraph tag in the DB. so it becomes <p><p>paragraph
description</p></p>.

Validation Error: No p element in scope but a p end tag seen.
mobile theme Undefined city

PHP Notice: Undefined index: city
mobil contact-form

Order ID & Product list fixed
kleine update

test
Precompiled idock 1.5 for Solaris
Changed Crud Functionalities
Updated Submodules
Integrate three.js webgl

meanwhile, fix a bug for the top div(id="container") which will cover
the whole website and the rendering of webgl will be overridden
add the missing files
many GUI elements
Merge branch 'master' of github.com:ICanHaz/Os-model
reset for bit bar
media-video/mplayer2: version bump to p20121128
handle pixelpipeline dirtyness
added id property to all imagesources
fixed imagesource tests
add joinRendering()
fixed imageScene2D tests
Modified the download option to point to latest release download.
Added header.html and added an import to every file using jquery.
Removing duplicate jQuery lib file.
uber_service & max number of connections across services
Fixade gött

Dundergött.
By rblanker: Updated mediamosa_sdk module to 7.x-3.1.
Clarify conditional assignment example.
Walls are now full polygons. Ghost ball is half way working.
Merge branch 'master' of github.com:JAFB/cpsc301Proj
Add Documentation
Merge pull request #53 from haria02/master

Add Documentation
Update phpdoc of getFields method

just a fix of copy&paste :)
Merge pull request #26 from oc666/patch-1

Update phpdoc of getFields method
Allow registered users to create issues
Override Platform classes with CMS versions that were Bootstrapped (Fix #21)
Only use the green save button for site
Undefined variable: input
Extend login method in site app (Fix #35)
Allow registered users to create issues
Merge branch 'master' of github.com:JTracker/jissues into mvc

Conflicts:
	libraries/tracker/application/site.php
	libraries/tracker/form/field/rules.php
Tweaks to status field
Context issues
Filters
Allow for template overrides for the component layouts
[fix] project filter
Merge pull request #37 from phproberto/project-filter

[fix] project filter
Update libraries/config.example.php

Since the file is config.example.php, we really don't need the class to be named JConfigExample. Saves a step.
Update README.md

If https://github.com/JTracker/jissues/pull/39 is accepted.
Merge pull request #39 from betweenbrain/patch-1

Update libraries/config.example.php
Merge pull request #40 from betweenbrain/patch-2

Update README.md
Update README.md

Code formatting
Merge pull request #41 from betweenbrain/patch-4

Update README.md
Update README.md

Code formatting
Merge pull request #43 from betweenbrain/master

Update README.md
Bug fixes, speed improvements and ability to toggle social buttons
Weapons2 mockup (красный)

Пустышки для второй версии оружия.
Simplify command creation via operators.
Corrected the last page of the second chapter.
Merge pull request #21 from Japh/master

Added Facebook submodule ready for testing #16
Nowadays stats is destroyed by cc1...
archivos sobre estilos
Merge branch 'master' of https://github.com/JesusKenji/ikela
found another case where my approach to TCO was flawed- return expressions computed based on a recursive call. Eventually I swear I'm going to get this correct.
Made a number of small changes to logo-print and the stack trace utility so that stack traces and printed lists are slightly more compact. This should make much better use of screen real estate and improve the odds that function call in a stack trace fits on a single line.
the to keyword now must be followed by a space. This solves an earlier problem wherein word names starting with 'to' were interpreted as a definition.
added some additional consistency checks for unpacking lists as well as assertions for fixed-size lists taken as arguments to primitives. The setcolor primitive now takes a list of RGB components rather than just a grayscale value. It goes against the retro aesthetic a bit, but it was a frequently requested feature.
Fixed Std.parseFloat in C# backend.
Fixed Array.remove in C# backend.
Added incomplete Xml C# implementation.
got maps working w00t
remove deleted files
added changes
added DB boilerplate
added psycopg2 i think
took out file
changed input name
imported ose
imported port info
imported port info
trying
typo fixed
add database url
added new postgres site
database try
changes to file
changed to port
changed to port
changed to port
changed to port
adding mobeelizer users
added crafty
updated ember.js to v1.0.pre

This was obtained from https://github.com/emberjs/ember.js/downloads
Merge pull request #347 from KingCrunch/master

Update modernizr to 2.6.1
Merge pull request #349 from scan/master

Added Crafty.js 0.4.9
Merge pull request #355 from notjj2/master

updating Ember.js to v1.0.pre
Added alloy-ui 1.0.1
Fixed underscore.string repository and homepage URL.
Added jquery 1.8.0
Added jStorage-0.1.6.1 from http://jstorage.info/ and http://github.com/andris9/jStorage.
Update require.js to 2.0.5
Update Backbone.Modelbinder to 0.1.5
Add unminified underscore.js
Added jquery-nivoslider for a pull request to cdnjs. Version 3.1 of the plugin committed.
Merge pull request #362 from ripper234/master

Added unminified underscore.js (1.3.3 only)
Merge pull request #361 from lenniboy/master

Update require.js and Backbone.Modelbinder
Added d3.js 2.10.0 minified and development versions
Updated d3 version in package.json
Merge pull request #359 from binki/master

Add jStorage-0.1.6.1.
Merge pull request #364 from matthewgall/master

Addition of jQuery (Nivo Slider) 3.1
Made the minified version the default for jquery nivoslider
Add VTK_DEFINITIONS for client/server wrapping

Change-Id: Iad115f09ac72eb999a7b00100e7a3faa1125d619
Link client/server wrapping against vtkIOMPIImage

If MPI is enable ensure the client/server wrapping for
vtkIOImage is link against the parallel version.

Change-Id: I12e2c542f624a5de2d4382247edbf7b4a8e20c9e
Merge topic 'nrrdreader-refactor' into next

4db370b Link client/server wrapping against vtkIOMPIImage
e7313f3 Add VTK_DEFINITIONS for client/server wrapping
Added polygon selection action button for chart view

Change-Id: I7c63586c057dd7a49e6bf9941631df48fb4f0aad
Fixed problem when ParaView isn't built with MPI.

Change-Id: Ife4f67159c78cd82fe60f4141bc3cf7650ce22fd
Merge topic '13175_unstructuredPOPreader_pv' into next

6841efd Fixed problem when ParaView isn't built with MPI.
Getting rid of compiler warnings.

Change-Id: I2b81b8fabafe0afb393b64198fbb1babd06264a1
Merge topic '13175_unstructuredPOPreader_pv' into next

7647299 Getting rid of compiler warnings.
Fixing another compiler warning.

Change-Id: I0e5d466d7e309c957d1cd06da573144d575503a4
Merge topic '13175_unstructuredPOPreader_pv' into next

2e4de90 Fixing another compiler warning.
BUG #13176. Fixed close-view segfault on Mac with QT 4.8.*.

The segfault was being cause due to some mac event coming through after the
frame had been destroyed. This fixes that issue by using a QueuedConnection.
Merge topic '13176_fix_close_view_segfault' into next

9576ff7 BUG #13176. Fixed close-view segfault on Mac with QT 4.8.*.
Modified some default mouse button actions for chart selection

By default in chart selection, the right-mouse-button will do selection
for rectangle or polygon selection in charts. However when one of the
Subtraction, Addition, Toggle selection mode is used, the
left-mouse-button will be used for selection instead. Also, one of the
right-button selection actions will always be active in charts.

Change-Id: I4e64d4c2c122ce25efe58c9c560cd214c3436d65
Bring in updated scatter plot code

Improved rendering speed of selected items in scatter plots, selection
mode behavior updates and fixed a bug in hyper jumping.

Change-Id: I7e89c7a082b75fbdd41344498c48b63c1ef0e19b
Merge topic 'chart_selection_actions' into next

70c0994 Bring in updated scatter plot code
dbebe87 Modified some default mouse button actions for chart selection
1b20fd5 Added polygon selection action button for chart view
Change references to vtkPNrrdReader to vtkNrrdReader

The object factory override will create the correct version

Change-Id: Ia1c18af2a84fdff3e73d0edd3e35a3dc58a105d8
Move VTK forward to include Nrrd reader refactoring

Change-Id: Ieec8d339cbee4ce7e2a0861dadf4410177aca62d
Merge topic 'nrrdreader-refactor' into next

97cb852 Move VTK forward to include Nrrd reader refactoring
e9a49f0 Change references to vtkPNrrdReader to vtkNrrdReader
BUG #13326. Fixed segfault in vtkPExtractHistogram in parallel.

Cleaned up the logic to determine the range for the bins. The logic was
confusing and hence must have missed some corner case which was causing
segfaults. This undoes an earlier commit to communicate the name of for the
"bin_extents" array since that array name is no longer picked based on the array
that was chosen, it doesn't made much sense to communicate that information
anyways.

Change-Id: Ifcf74b8e541dfebb06b4d204c0edff70dd8372f2
Merge topic '13326_fix_parallel_extract_histogram' into next

0075033 BUG #13326. Fixed segfault in vtkPExtractHistogram in parallel.
Installing pvserver etc. in the app bundle on make install.

1. Disabling generation of shared forwarding executables on mac. That's no
   longer necessary on Mac. We should use install_name_dir even when not
   installing apps (that's not currently supported, however).

2. Adding all executables to the export targets list so that projects can use
   those targets.

3. Updating ParaViewBrandingInstallApp.cmake to ensure that all executables in
   the <install_prefix>/bin directory get placed in the app bundle under
   App/Contents/bin. Since these executables already have their install_name_dir
   set to point to @executable_path/../Libraries, we don't need any shared
   forwarding and the executables find the libraries just fine.

Change-Id: I63454a5abc03ff71a076cbe56a5936097f3c8b25
Merge topic 'fix_mac_install_rules' into next

574fdec Installing pvserver etc. in the app bundle on make install.
Getting rid of compiler warning.

Change-Id: If1cff9f5b251311f87c60f43edd79a60651cce55
Merge topic '13355_vtkPVTrivialProducer_time_info' into next

29736c3 Getting rid of compiler warning.
Bring in VTK fixes.
Merge topic 'fix_mac_install_rules' into next

47913e9 Bring in VTK fixes.
Add return value to pqScalarValueListPropertyWidget::addScalar()

This fixes a build issue on windows in which the addScalar()
method in the pqScalarValueListPropertyWidget was not returning
a value.

Change-Id: I5a5ed12b02c62fd1bc32603a5d70f91a9d34d11f
Merge topic 'new-cut-panel' into next

3d92428 Add return value to pqScalarValueListPropertyWidget::addScalar()
General comments and code fix

Change-Id: Iacb5161cca6eaeb3c102446cdf49e1d164c313b4
Update the code base of ThreeSliceView

Change-Id: I9ada2488fe86c8238e482229392ff5f5c1f1049a
Merge topic 'modularized_multi_slice' into next

4eb139e Update the code base of ThreeSliceView
1997ccb General comments and code fix
General comments and code fix

Change-Id: Iacb5161cca6eaeb3c102446cdf49e1d164c313b4
Merge topic 'fix-find-dialog-warning' into next

9d443aa General comments and code fix
Restructuring coprocessing tests.

Using CoProcessingTestPythonScript.cmake to run the coprocessing tests instead
of generating tests script. We ensure that we pass correct arguments to this
script to help it find executables correctly.
Fixing CoProcessingFullWorkflowTest.

Cleaning up CoProcessingFullWorkflowTest to use cleaner test code.
Merge topic 'fix_coprocessing_test' into next

d7c6003 Fixing CoProcessingFullWorkflowTest.
b4b1b42 Restructuring coprocessing tests.
Move TimeLabel SI property to the right location after modularization

Change-Id: I3cd6c5b2e6b16266536b8ce722d1c6c2cddcbf12
Merge topic 'fix-non-orthogonal-axis-with-modular' into next

43cf3d6 Move TimeLabel SI property to the right location after modularization
Fix compiler errors on pgi.

We were getting the following errors:

expression must be a modifiable lvalue
  commandLine.insert(++commandLine.begin(), "--multi-servers");
Merge topic 'fix_pgi_build_issues' into next

f8b0198 Fix compiler errors on pgi.
0.2.3 Inside images for malls, staduims, and mansions
Added a home controller example for the git extensions tutorial video.
Beginning to do some proper character handling
working on elastic usecases and mongo schema design
Update README.md

update Ryan's link.
add more config options for Rails in .gitignore
Small cleanup.
Add console command which prints the registered dynamic object in Framework.
Documentation/doxygen notation tweaks. Remove deprecation warning print from Scene::GetConnectionIDs as the function is still quite commonly used. Deprecate Server::GetActionSender (now ActionSender).
Revert QString -> const char * parameter change in order not break anything.
EC_LaserPointer: use Placeable's world position, in case the Placeble is parented, when settings laser start pos.
Add functions for both implicit and explicit conversion from Color to float4 in order to enable math-related functionality (lerp et al.) for the Color class easily and without duplicating code.
Completed the docummentation and done some minor refactoring.
improve autorun.sh
improve autorun.sh
added CSS support
added JS support
added theme dark and demo, multiple bug fixes
Add changelog header
Made object for diff pages, general housekeeping
Created minified JS file
r0020 - patch bedouin culture and fixed anomaly in sweden
enlarge inner frame
change mailer sender for devise

example addresses are not good on production systems ;)
fix another problem for ruby 1.8

Encoding doesn’t exist in ruby 1.8, so just silently ignore it.
'phototest'
Enabled setting/getting text via ActionScript.
Reworked based on the review feedback.
Merge pull request #23 from kuu/master

Enabled setting/getting text via ActionScript. (2nd)
reworked query for task entries in week view to use start and end date
Updated back for merge testing
Readme modification

Adding project Name, Main app name and project email.
StdFunctionLabel uses enhanced coloring. Comon behavior moved to super
Resize fix
Merge
Changes that don't work.
Error
better description verbage on readme.md
Signed-off-by:Bear <Bear@192.168.1.39>
Unified theme. It's pretty. I think.