labofsahil/github-event-dataset-2012 huggingface dataset:
new file:   vendor/ZF2
zf2配置完成
	new file:   .settings/.jsdtscope
	new file:   .settings/org.eclipse.php.core.prefs
	new file:   .settings/org.eclipse.wst.jsdt.ui.superType.container
	new file:   .settings/org.eclipse.wst.jsdt.ui.superType.name
fixes an avahi issue where the network domain .local is already used
find dialog autofocus
Revert "fixed autoscroll with typing"

This reverts commit c87593f2cbddee585ae15c5d69a55773e3d3c0ce.
theme imgs returned back
Merge branch 'master' of git://github.com/xlcteam/nxtIDE
nothing
Merge branch 'master' of git://github.com/xlcteam/nxtIDE
adin's dialog
Merged revision(s) r18459 from trunk:
bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat"

git-svn-id: http://piwigo.org/svn/branches/2.4@18460 68402e56-0260-453c-a942-63ccdbb3a9ee
Fixed stripped down code
aggiunto file primo.txt
全屏图片展示Css3
全屏图片展示Css3
Added preprocesor switch for multithreading
Cleaned arround
Unnecessary val
Simple comment
Delete unnecessary debug.inc.php
Treat index.php
Wrong include timing quotes_stripper.inc.php at PHP 5.3
Changed VPN-Server
-Dオプションでデバッグ情報を表示できるようにした
-Tオプションで実行するホストを指定できるようにした
default to polling every second
finished predict
patch 7593
patch 7641
patch #7642
patch #7644
patch #7645
patch #7646
patch #7647
patch #7726
patch #7727
patch #7728
patch #7755
patch #7732
release-3-1-1
less allocations

BasicSocket.iter_timer: do not allocate new list when not needed
CommonFile: use Queue for sliding window
DC: show hashing progress in dcinfo
tweak previous commit - more robust
DC: fix ownership for downloads by non-admin users

reported by pixit - http://mldonkey.sourceforge.net/forums/viewtopic.php?p=31654
build: call `$(CPP) -x c` instead of `cpp`

Conflicts:

	config/Makefile.in
Merge branch 'upstream'

Conflicts:
	src/networks/direct_connect/dcShared.ml
ещё один метод в чмокплагине
Added plugin initialization routine
fix code not uptodate problem
added checkBook method. tested and working
Performance optimizations for opening and closing images in the switcher theme.
Reverted back to SOAP

SOAP returns better formatted results for use with JSON.  Added
environment variable and added 30 second timeout to REST call for
transaction search.
Merge pull request #172 from paypalx/master

Reverted back to SOAP request for our rest calls
Ajaxリクエストの時はajax/からコントローラを探索するように変更
required Guard.pm
add basic documentation for v1 HTTP interface
Initial commit
Merge https://github.com/yuanx/leetcode
Merge branch 'master' of https://github.com/yujis2jeh/Mubi.git
Merge branch 'master' of https://github.com/yujis2jeh/Mubi.git
Site updated at 2012-03-28 16:36:47 UTC
[diagnose] quote
[tools] add fcitx-diagnose
Add Haskell code
simpleJSON
Version Bump
Add LICENSE file to individual bundles that make up the optimizer release
Prettify bundled output.
diminuindo o raio de colisão dos personagens doença com o pesonagem
principal 
implementação para que personagem principal não morra com uma certa
facilidade.
Arrumando a identação do codigo e alguns debugs do  jogo
Seg fault 'zpool import -d /dev/disk/by-id -a'

Introduced by commit 44867b6d6effc1628dd00c36821ab044f89fb988.
We should of course check to ensure best isn't NULL before
attempting to dereference it.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #974
working secret santa. me hopes
IMAP: Add test for uid store without arguments
IMAP: Add a few more uid store tests
IMAP: Combine handling of fetch and uid fetch
IMAP: Fix parsing of * in uid ranges
IMAP: Fix seqnum to uid conversion
IMAP: Make test UIDs non-consecutive
arrumado alias do sublime
added fake timer
reduce usage of the printf-statement
tighten things up slightly
mp_unitn sorgenti
add table.py
add met get_columns()
add parens to declare of class
do not call PSQLiteTable directly
Further optimizations: remove hasOwnProperty backward compat
Add a REAME.
css fix for template editor
obj -> self
Small change in demo
json_response
expriment report score
sigma2b seems ok! his to corrected! now have to output  otsu image
Add AwesomeMenu podspec
fixed wrong form action, hide people without any dish
corrected "tasks" to "deliverables" in the task template.
Correcting Ontos and Unister
draw 3d board on top of marker
Added PS_ACAD_PLAN_TBL to table load
Make default READAHEAD size a kernel parameter.
Add new kernel parameter "readahead", which would be used instead of the
value of VM_MAX_READAHEAD. If the parameter is not specified, the default
of 128kb would be used.
* Put atmosphere composition calculation from Oxidizing variable to one
enum type and one function
* Use element-specific molar masses and specific heats
Cleanup
Merge branch 'atmospheres' of https://github.com/irigi/pioneer into atmospheres and Update interfaces and calculations to use average physical properties.

Conflicts:
	src/Planet.cpp
	src/galaxy/StarSystem.cpp
	src/galaxy/StarSystem.h
rev1
rev1
Lighter notation for module functions
Pinned Site Tile - Niebieska kafelka, niebieskie logo
added sort by date to the range function
update gemspec for v0.2.2
Merge branches 'master' and 'develop'
change umask in bashrc
Update doc/KML.md
path extractors: cleaned up and added specs
Arachni::URI.cheap_parse: Updated to sanitize the encoding of each parameter name and value individually [Closes #303]
Sql version of Arctium (default is object database in master branch).
Merge branch 'sql' of git://github.com/Arctium/Arctium
DB/linked_respawn Fix error consol: Couldn't get gameobject/creature data for GUIDLow

Remove invalid entry

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
DB/quest_template Fix error consol:

PrevQuestId because quest was marked obsolete by Blizzard and cannot be obtained or completed.

Signed-off-by: Mikadmin <mikadmin@wow-attitude.com>
DB/SAI: finished Thousand Needles zone - now all opened zones in Kalimdor done. thanks to all bug reporters,to users for sniff data... we did here a great job...
Revert "tabs2spaces"

This reverts commit cf2cae4d827d745b165775683adf73435a1f62ca.
git fixes
...
Documentation update
Added vector reading test
More booking work
made speed slider show on both tabs
show users in queue
tell controlling users how many seconds left
Merge pull request #4 from timothyclemans/master

Made speed slider show on both tabs
Fixing typo in Events link
Found a better place to stick the "About me" link
Update readme for fork information
changed default access level for !news and !is from all to member; added items to fix in items db rp
add README to view/build the doc
[Add] ODIN (1.01)
[Fix] RestKit preferred dependencies.
[Add] AwesomeMenu (0.0.1)
Creating site for joala-testlets, 0.7.0
Creating site for joala-dns, 0.7.0
Added page revomal via a link. Closed #892.
:S
awesome...
Sửa phần hiển thị bản đồ theo khu vực trung trung bộ.
Revert "settings.php"

This reverts commit 720acf3c555d8455a9596a5c9abb7f9abf0b5432.
Tos update 5/8/12
Merge from Tos
v6r4
Add option to the Reminders module to toggle strict filters. Having this option off will allow you to use the Reminders module for spells that aren't in your spellbook. I.E: Spell Proc's.
Add button in the reminders module to toggle Show/Hide of your reminder icon.
Add option to the Reminders module to set the xOffset of the icon.
Add option to the Reminders module to set the yOffset of the icon.
Fix issue with having the portrait overlay option turned on was causing the incoming heals to not display for the player and target frames.
Raid Debuff module was not using a filter and displaying all icons. This was caused when I attempted to fix a lua error a while ago.
Слияние
#79 part of gio removed
bmp file format.
Started working on charts
list of files updated for 20120928 at Sep 30, 2012 6:38:02 PM
Updated TODO.md showing #17 completed
Updated git hash on PCB to 61f0629e7d052d37d8f7bec4d48e303a9adba4e9
renamed ::ipcdetail to ::detail, as we are still using boost 1.47
Added landscape money view.

Fixed bug where money wasn't initializing when the screen was rotated.
Added Ability to Create Projects
+ thumbnailbalk: miniatuur weergaves van de pages
+ thumbnailbalk zichtbaar on hover
+ keyboard navigatie toegevoegd
+ awesome tweens bij updatePageView, in de juiste richting (ik hou dit bij in een var direction:String in de appModel)
+ xml: wat pages toegevoegd
+ in TextFieldFactory een wit tekstveld toegevoegd
+ page numbers toegevoegd (per 2, dus telkens 1-2, 3-4,...)

Wat er nog niet werkt:
- Mask op thumbnailbalk (maar 'k ga er nog wat op zoeken)
- volgens mij moet dit allemaal nog in een aparte klasse? Of mag dat in iBook blijven?
Fixed URL paths to be absolute for lists and user gsps.
config.proprierties updated. New querting methods added to the data access layer.
Rapport, corrections.
deleting control, for the testing

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
adding carbon pull form survey. still in TEST, will be moved to WORKING if agreed upon (should be)

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
user, reserva for date and more
insert backUps
add marckUP
x11-libs/qt: changed EAPI to 2; because we need strict block for softer kde3 update process
IOIOManager update
'new post dialog' is now being shown at the bottom of the page
libfreerdp-utils: Fixed missing wcsdup on Android
Merge pull request #613 from mfleisz/master

libfreerdp-utils: Fixed missing wcsdup on Android
libwinpr-crt: add extra null-terminator for ConvertFromUnicode.
check hostname for insert indicator
.git/info/exclude corrected
Later, real DNS seeds will need to be put in. Just need ScamCoin to compile for now.
Upravene osetrenie vstupov
Stop emails from Travis notifications.
tbs-drivers : bump to v120604
crystalhd : remove include <asm/system.h> cause it does not exists in kernel 3.4 anymore
libaacs : bump to 0.4.0
libbluray : bump to 0.2.2
libdvbpsi : bump to 0.2.2
linux: upgrade to 3.4.2
xf86-video-fglrx : bump to 12.4 and fix issue with kernel 3.4
xbmc : add specific version for panda
alsa-lib : add ucm config files for panda
alsa-utils : use the correct config for panda
udhcpc : rework for panda
libcec : bump to 1.7.1-1 and update dependencies
xf86-video-fglrx: rework patches, fix build
udhcpc: default to eth0, better quoting
systemd : bump version to 185
xf86-video-nvidia-legacy : do clean install on target
systemd: rework package to takeover udev
packages: s/udev/systemd/g
flavours: drop depends on udev package
udev: drop package, this has been assimilated by systemd
Update i18n in geonode/layers/templates/layers
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Merge branch 'dev' of github.com:GeoNode/geonode into design
Add comments tab to layer details, improve pagination js
Bold nav items on subpages, use Lato for nav-tabs
UI fix for arrow toggle spacing
port over layer explore improvements to maps
fixes for filters and categories
add tab interface to maps detail
rebuild css
Fixed merge conflicts in base.css
- Added text to creature 2858

Gringer <Wind Rider Master> (2858)
Rename TimerResultMessage to TimelineMessage
Fix broken test
Remove unused `this`
arrow mod
[22287] Bug #680887 - RELAX NG schema for 2.4.11 XML file format
Contributed by Baptiste Carvello

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/branches/2.4@22288 57a11ea4-9604-0410-9ed3-97b8803252fd
Add empty cache dir
fix fk constraints
fix people fks in join tables
gmaps4rails
remove grid for logos
change default logo
add edit button
change default logo
implemented gmaps4rails
default logo
set delete permissions
Filled out some test UI elements in a FloatLayout container.
Call bashrc via bash_login
fix focus
fix menu title
more translation
fix qmd layout & color & postview color
target new sdk, bump version
Added new blocks and more views in commercebox analog
Design-updates again
css changes for Joomla 3.0 to handle cpanel and event editing pages
New icons for css changes
New ways of hiding submenus
Start backend changes to support JForm
allow extra info field through raw filter and replce nl1br if no HTML in content
allow extra info field through raw filter and replce nl1br if no HTML in content
Fix warnings and errors at startup. Add hashCode and equals to PK
objects.
Add config to realm.
Fixed some errors.
Add integration test for club (single howell session) tournament.
Add string formatting slides
Parse error message includes line/column.

And a real parse exception.
实现了 db 的数据表自动处理前缀
Add CSS3 font support for MainHeader class
completed module commenting, coherent parameter names
fixed small bug caused by parameter name change
OpenCV integration and keyboard control
Kfold
Parcours des éléments TITRE, SOUS-TITRE et P des fichiers XML
argparse improvements:

*) code deduplication
*) added epilog, prog, suppress_warning, custom usage lines
*) by default, show usage when parsing fails
*) use matavars to uniquely identify pos. args
*) stricter duplicate check
*) improved default value checks for multi-actions
shootout: sequential version of reverse-compliment
Merge pull request #1080 from davekong/reverse-compliment

shootout: sequential version of reverse-compliment
add readline-win exception to .gitignore
Move boot.jl to base
use isfile() in load instead of is_file_readable
cairo: rethrow library opening exceptions
don't mark a file as loaded if it throws an exception
add macroexpand() for #1191
OpenBLAS: upgrade to v0.2.3 and switch OS X back to using OpenBLAS
install extras
resize fix...
Merge branch 'master' of https://github.com/JureUrsic/Alert
Updated some stuffs.
fixes to load libfcgi on Mac OS.
Merge pull request #2 from fukamachi/master

fixes to load libfcgi on Mac OS
added directory with all of the files in the DT test
requiring new minitest gems
Merge pull request #800 from jlsherrill/spec_update

requiring new minitest gems
system groups - converting ui to only add/remove systems to a group for readable systems
introducing katello-utils with katello-disconnected script

The katello-disconnected script communicates with pulp instance using REST
and OAuth to synchronize repositories exporting them into a directory
structure that can be imported into Katello later on. It is able to import a
manifest file retrieving all provided products and repositories from the Red
Hat CDN, creating those repositories in Pulp, initiating synchronization,
watching the progress of a sync, exporting the content into a directory and
refreshing already imported manifest.

More info about workflow and other in the man page.
Automatic commit of package [katello-utils] release [1.1.1-1].
adding two requires and comps for katello-utils
Merge pull request #749 from lzap/manifest_parsing

katello-disconnected tech preview
Added LDAP roles verification in API controller
Fixed clearing of existing LDAP roles
test nouveau Makefile dans WebServer et utilisation du Logger pour le serveur web
Merge branch 'master' of github.com:KenTiN/PolyPeer
Added display of categories to titles.
24/7/12
Added initial version of the linux installation guide.
Fixed a warning being generated on the build.
Use mem_fn to shorten the code (tip by Anthony Williams in C++ Concurrency in Action).
Merge pull request #217 from apathyboy/develop

Initial commit of linux installation guide
Check for a vendor dir in the source directory as well as the directory above.
Added the initial version of the windows install guide.
Fixed a few wording usages in the linux install guide.
Merge pull request #218 from apathyboy/develop

Initial commit of windows installation guide
Limit the depth on the index page to just the main page titles
Merge pull request #219 from apathyboy/develop

Limit the depth on the index page to just the main page titles
Account for the already existing main thread of execution when spinning up threads for the thread pool.
Merge pull request #220 from apathyboy/develop

Account for the already existing main thread of execution when spinning ...
Moved bindings around into their own subdirectories to break out the python modules.
Updated build process to create subdirectories for each python module.
Added init scripts for python modules
update rst and add a new binding. All seems to be working except the code.
Clarified that the bootstrap command for boost should be run inside the boost directory.
Added a bit about the additional optional parameters that can be used with the ./setup.sh script.
Merge pull request #222 from apathyboy/develop

Clarified that the bootstrap command for boost should be run inside the ...
added some PATHs to the init bindings in order to point the proper way to the dlls. Updated scripts to use bindings instead of swganh to be uniform with the documentation.
lots of stuff...
Merge branch 'python_templates' of github.com:Kronos11/swganh into python_templates
more work, doesn't actually work yet though...
fix problem from recent commit with Tangible loading
Merge branch 'develop' into python_templates
Added first run through of built templates, also fixed a few bugs, can now load objects properly
add menu css base exemple
First commit of MCNSApo8
Completed
Merge pull request #580 from OctopodaChong/patch-33

Completed
fix doctype decorator
Header support for TestOven report building. Report building unit tested. POD documented it too
#7: Add role to consume when you want to represent generating a report. TestBatch currently uses it, though not well yet
#7: Make TestBatch use attrs defined in GenReport. POD'd the crap out of GenReport.
#7: TestOven moved report attr use to base role GenReport
Update lib/MyTester/Reports/ReportLine.pm
Update lib/MyTester/Reports/ReportLine.pm
Update lib/MyTester/Roles/CanGrade.pm
Update lib/MyTester/TestOven.pm
#10: Ovens and batches now report point summaries w/ footers.
#10: Ovens and batches now report point summaries w/ footers.
Merge branch 'generateReport' of https://github.com/LeboyX/MyTester into generateReport
Update lib/MyTester/TestBatch.pm

Moved POD comment to right method.
Update lib/MyTester/TestBatch.pm
Update lib/MyTester/Roles/Provider.pm
#11
Merge branch 'generateReport'
#11: IdSet created and tested
111
Merge branch 'master' of https://github.com/Leefrost/Gambit

Conflicts:
	Gambit.Visual.Kohonen/Gambit.Visual.Kohonen.csproj
	Gambit.Visual.Kohonen/Gambit.Visual.Network.csproj
	Gambit.Visual.Kohonen/KohonenNetwork.csproj
	Gambit_AI.sln
Добавлена обработка паузе при разрыве соединения
Modified README
Initial commit 2
the one true commit
remove the CodeIgniter user_guide
update .htaccess with RewriteBase
update .htaccess with RewriteBase
create some basic pages
dot try and load a lib thats not yet built
add message pages and start to code login page
add javascript
add css
fix css and js links
css updates
more css updates
page title updates
get a basic forgot form in
get a basic forgot/register form in
add user mail lib
valid email function fix
valid email function update
valid email function update
use CodeIgniter valid_email function
[doc] CONTRIBUTING: added a CONTRIBUTING.md file to support github contributing guidelines, which is a merge of GUIDELINES and DOCUMENTATION
FILTERLIST WITH PAGE
DeleteLight(), small fix to network to make it compile.

Signed-off-by: MaloW <malow@spray.se>
Merge branch 'master' of github.com:Malow/PowerBall
lecture_notes: added A. Sidorov's notes on Josephson junctions
Add tests for return type of color and theme properties
Fix to coerce object input back to string in null stylize operation
Merge pull request #20 from cjc/master

[fix] Theme properties return object when mode == 'none'
Stopped using separate files for CSS
项目文件更新，增加历史按钮图片
added ability to detect who lamed a song
Changed iPhone Size to 800px
added tags (l10n-fi) to ticket 1335368972_factoids-l10n-fi-should-be-checked-_225
added tags (factoids) to ticket 1335368972_factoids-l10n-fi-should-be-checked-_225
remove useless packages
Merge branch 'master' of https://github.com/Mogzor/AnkiPres
Refactor framework loading.
CoreMedia and AVFoundation are only available starting with Mac OS X 10.7.
Add new tests.
add new dialog CGUIDialogMediaFilter
media library: add a new button and logic for advanced filtering using a smartplaylist
media library: adjust the paths and the history to be able to return to a filtered list
[confluence] add new button for advanced filtering
[confluence] add DialogMediaFilter.xml
[darwin] - allow building depends against ios6 sdk
[ios/atv2] - disable usage of fastmemcpy - it breaks build on apples newest buildtools (xcode4.5/ios6 sdk)
[darwindeps/python] - fix missing _environ symbol which was resolved by accident in older darwin versions (but doesn't work anymore on osx10.8 and ios6.0) - see http://bugs.python.org/issue1602133
[lang] fixed: removed translator's data along with email addresses from PO files to avoid spam
fixed, used the same ifdefs from rpi omx_image
jsonrpc: don't retrieve video details for every item when the "resume" property is requested
fix and bump touched submodule
[aml] fix amlplayer linux build

This unifies linux/android loading of libamlplayer. We dyload libamlplayer.so
on both platforms now.
Added Japanese layout, update in Spanish layout

Addition of japanese.js layout and update of comments in spanish.js
Japanese layout added

Japanese layouts added:
japanese-kana and japanese-qwerty
Merge pull request #101 from pacoalcantara/master

Addition of Japanese layout
Removed the install web directories step and started a pending window.  This will be considered version 1.0
Logos linked in solution folder
DerpyAI ServerDriver: don't SOP debug
a simple version
list the right app
alpha version for read xml task1
callback history
Merge remote-tracking branch 'origin/master'
added 80 char limit to ban/kick reasons
fixed RegEx to chat PB kick messages again.. why have they changed that string
tests for issue #1984
retrieve settings with symbols
Stub for Dir.chdir as it is not needed
Rewording for the account being blocked

When signing in with SSO, if the default behaviour of gitlab is to block SSO user, the only message the people will get is 'Your account was blocked'

They should get the idea this might be only temporary and not because of a technical problem
Filter projects on dashboard
Fix MR comments
change version to 4.0.0pre
Use project owner if no namespace. Restyled team page
Added vendor/bundle to gitignore. Removed project js slugify
Merge pull request #2017 from duksis/backup_restore

bugfix: backup data retrieved with the same type keys as saved
Merge pull request #2059 from dolanor/feature-rewording-blocked-users

Rewording for the account being blocked
API version returns last version set

  * fixed in grape v0.2.2
API: expose created date for project hooks and user SSH keys
update contents of API README
test hackport without embedding cabal, stage 5
convert _sprout and _hatch (and _fast variants) to Scala
avoid Java collections API in api.ModelReader
avoid mutable collections in api.ModelReader
avoid mutable collections in api.ModelReader
avoid mutable collections in api.ModelReader

plus minor cleanup
minor cleanup
convert prim._goto to Scala
sbt build: fix model-index when there are spaces in repo dir
(cherry picked from commit 1e2530bf86425161776d2743a96a3dd31c750114)
sbt build: fix model-index to fail when `find` fails
(cherry picked from commit 4119f72d89ae280f47de52a7e4805cdfeab8632e)
Merge remote-tracking branch 'origin/master' into modelruns
Fixed load.php
Added default pidfile.
Created link issue.

Plinth really should link clients to the right pages.
Merge branch 'master' of github.com:NickDaly/Plinth
update image url in README
Added some rough concept sketches.

- concept for big guy robots
- concept for general ship environment
- kurton and trianglebutt's level 1 floor plan
- concept for little guy robots
Added support for osx Apps
more stuff
more
more more
[lcd skin] fix skin name
testing admin stuff
nice routing update
added basic linkedin auth
Merge branch 'master' of github.com:Orchive/Orchive into sabar
more updates to user. ammo for the arsenal.
Merge branch 'master' of github.com:Orchive/Orchive into francis
fixed protected method error
Merge branch 'master' of github.com:Orchive/Orchive into jon

Conflicts:
	app/models/user.rb
Can mark tasks as done
section 5.3

Signed-off-by: Phanta <enrico.grunitz@mailbox.tu-dresden.de>
Updating README with better instructions.
Renaming README
Fixing README syntax.
Obstacle collision modified
Merge branch 'master' of https://github.com/ProjetX/ProjetX
netoyage
Merge branch 'master' of github.com:ProjetX/ProjetX
Implemented and Commented Emitters: Return, and added branch registry support for return to epilogue
Add PC5 type to Algorithms exports
Change luminance gradient to use Repa's stencil convolution
Fix for the Found Users header. Closes #171

This commit fixes the the bug that repeated for each found user the
headers "Found User"
ゴミ掃除
BezierA
ボタン配置
空中ジャンプ実装。
bezier
ボタン
更新処理の振り分け方を変えてみた。
Merge remote-tracking branch 'kimura/master'

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

Conflicts:
	ScrollNinja/bin/org/genshin/scrollninja/BackgroundManager.class
	ScrollNinja/bin/org/genshin/scrollninja/EnemyManager.class
	ScrollNinja/bin/org/genshin/scrollninja/Pause.class
	ScrollNinja/bin/org/genshin/scrollninja/StageObjectManager.class
	ScrollNinja/bin/org/genshin/scrollninja/StructObject.class
	ScrollNinja/bin/org/genshin/scrollninja/WeaponManager.class
add scorched
Updated Loan Application
	application_ledger_list.xml
	LedgerList
added SlugConverter class
ArrayList & get methods added

Arraylist storing the roundobjects added, and get methods added.
Checking if im able to print out the values.
Added dealACard but MSVS doesn't want to compile it
Revert "m_ssl_gnutls: use recommended DH bit sizes instead of user-specified value"

This reverts commit 2b6b98bafe566874ea00abf4b0d35cd8cda5212f.

This uses API which is only available in gnutls 2.12.0, which is very new
(comparatively) - only released in march 2011 - and thus many distros will not
have had the opportunity to update yet, causing compile issues (see issue #49
for instance)

As this isn't really crucial, back it out, for the time being.
Fix unused variables reported by the clang static analyzer.
Show class in connectmsg

Made the connect announcement show the class a client is in, making it
easy to spot if a client is in the right class.
Merge pull request #54 from SaberUK/clang-analyze

[2.1] Fix unused variables reported by the clang static analyzer.
Merge pull request #58 from Justasic/insp21+connectclass

[2.1] Show class in connectmsg
fixed accelerate/decelerate to not take parameters
Nu finns där en disk med en FatMeter som fungerar på!!!
Merge https://github.com/RKrogh/FatBoy

Conflicts:
	src/FatBoyHero.java
Tweak the title and description.
adding bonsai js to project
Changed mime-type to media-type error_type table of project.sql
Upped file limits in download and metadata commands.
Example hydra converted VCF output
Remove no phone home flag for GATK to be compatible with GATK 1.5
Update dbSNP and Mills standard indels for latest GATK
Clarifying which version of Picard is supported in the README.
Unlink testing universe_wsgi.ini
Put back tool-data files that seem to have been lost
Merge pull request #127 from vals/develop

Develop - Merge from upstream, mostly GATK 1.5 compatibility.
Added some more lines to .gitignore.
Got rid of a couple of warnings about signed/unsigned comparisons.
Fixed an uninitialized value warning in storage.cpp and used more template-fo in ruby_object.cpp.
Merge branch 'master' of github.com:chriswailes/nmatrix
SEQWARE-1306
Merge branch 'feature/feature-simplifiedworkflow' of https://github.com/SeqWare/seqware into feature/feature-simplifiedworkflow
javadoc
dot
Reduced parameters to minimum, tested with tutorial again
Adding test with demonstration of batch mode (results somewhat confusing, see blog)
Fix old command grabber.
- Added vimshell/zsh_complete source(imcomplete).
- Added condition check.
- Improved vimshell/zsh_complete source candidates.
- Improved vimshell/zsh_complete source.
- Set LISTMAX.
- Added <Plug>(vimshell_zsh_complete) keymapping.
Fixed DFowlers WP7 .nuspec issue

Not Lickable
Updated Build to run code analysis command line
Removed CodeAnalysis pieces to individual projects
Changed Build to be better code, to quote dfowler: "I wish I could lick your screen"
Uncommented the old Go task and added common msbuild tasks
Merged!
Removed more ruleset pieces on the projects
Updated Build.proj to point to SignalR.Core

Also added own property group to Microsoft.AspNet.SIgnalR.targets so
that it's ran appropriately.  When it wasn't in its own property group
it was not applied.
Ctrl K D
Ctrl K D
Start config windows in the middle of screen.
Added --help and --list-devices
Added parameter-checks and error-handling
More mac-magic: CMD+Q/W closes Lettuce, fixed layout
Always exit if there are bad arguments
Merge remote-tracking branch 'mluto/master'
smal chng
Merge branch 'staging' of github.com:Smotko/estudent into staging
omejitev
Update prezto.
Switch to CtrlP and use ZoomWin.
Tastes salty
Fixed wildfire coordinate spamming.
Up to P25
* Minor edits to message text.
Deal with the complications created when the player is an enemy of House Sirius

Signed-off-by: Sudarshan S
Changes on EVENTS
New build.sh in parent folder
Yeah twitter and messages
Added "hoi" to line 4r
Added Player.getEyeHeight().
Added onPlayerMove to abstraction layer.
Added a visual way for moving nodes around.
[maven-release-plugin] prepare release 0.0.10
Updated
commit
Move mod include to separate namespace
Make namespace change to tw_ismod
RESOLVED - issue GWDP-293: Intelligent scheduling for pre-fetch 
http://internal.cida.usgs.gov/jira/browse/GWDP-293

Queries to investigate timestamps in the waterlevel data.
Debugging and a fix for some tests.
Update mybatis version to reduce logging.
RESOLVED - issue GWDP-447: Cache Fetch Numbers not Adding Up 
http://internal.cida.usgs.gov/jira/browse/GWDP-447

Fix build.
nodes rest should end in /
screen scaling optimization
uncomment imports in DXDAL.h
added b_dev
not passing the correct value to the console
Updating my gh-pages.
f. push
added some more stuff, result box, fixed components
added actionlisteners to specific components
registred components to specific listener
added some first implementation when pressing entry buttons
added file chooser for choosing databases to work with
added switch for files instead of credits
Add the second ClearVideo VC-1 type to the list of hooked VC-1 types
Fix more cppcheck warnings:

* uninitialized variables
* variables are assigned values that are not used
* reduce variable scope
* initialize variables in the constructor
cosmetics (WIP)
WebServer: merge a few properties (WIP)
updated FFmpeg (n0.8-16139-gb473c99)
update patches
личный кабинет - блокнот, частично статьи
Updated V2

Texture
Enhanced form display
more deub
Updated MS1
Move similar views to the shared package (Issue #11)
Move listing of available commands to AbstractTerminalInterpreter (Issue #13)
modified:   master.php
    "new" branch test for master.php file
	modified:   master.php
    "rebase" command test for new branch
	modified:   master.php
    aaaaaaaaaaaaaaaaaaaaaaaaaa
    "rebase" command test for master branch
	modified:   master.php
    "rebase" command test for master branch of 3
    oh~~ no ~~~
    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
	modified:   master.php
    xxxxxxxxxxxxxxxxxxxxx
reinstall node modules with -g option
gokhanmoral: Enable 1500 and 1600 MHz
Se actualiza core de la app.
create a package in pulp after uploading for #24
add uploaded package to specified repo for #24
remove hard-coded pkg id

whoops
should properly associate rpms into a repo for #24
include rpms in the specified repo(s) after upload
added ability to examine different components of the error
doing fitting that includes constant and scale
Merge branch 'master' of git@github.com:djyaron/msqc.git
working on adding bond order dependence, not yet debugged
Bug fix with Mixer.print
Used for bl dependent fits
with print=0, it now keeps track of error versus iteration
minor changes while analyzing data
Initial attempt to add hybrid mixing. Running, but not debugged.
changed nenv
Minor changes to multi fitting code
Bug fix for sp2 hybridization
changed ipar>1 fits to be reasonable choices
minor changes while fitting
Merge branch 'master' of git@github.com:djyaron/msqc.git

Conflicts:
	multi6.m
minor changes for fitting
analysis of results from hybrid analysis
added some testing of hybrid code
Fixes, so these work for ienv = 0
running calcs again in parallel mode
fix create member to redirect to member search
Initial support for CSS border-radius (thanks to Dan)

Update issue 368
There are still issues with the PDFLib adapter, but background clipping and the top left border bug are fixed with Cpdf

git-svn-id: http://dompdf.googlecode.com/svn/trunk@496 8e70de24-3a84-11de-b438-597f59cd7555
Fixes border-radius on images and better clipping of the corners (Updates issue 368)
Fixed a few bad escaped regex patterns (Updates issue 514)

git-svn-id: http://dompdf.googlecode.com/svn/trunk@497 8e70de24-3a84-11de-b438-597f59cd7555
Out of flow element are handled like block elements (Fixes issue 318)

git-svn-id: http://dompdf.googlecode.com/svn/trunk@498 8e70de24-3a84-11de-b438-597f59cd7555
Improved code formatting (braces for control structures)

git-svn-id: http://dompdf.googlecode.com/svn/trunk@499 8e70de24-3a84-11de-b438-597f59cd7555
Form elements are now displayed

Update issue 79
Form elements are now displayed, with CSS generated content, a bug in the CSS parser prevented to do this before, but I solved it. Everything is still not perfect, but it is a good start. It will be in the next release or if you are impatient, it's in the SVN trunk.

git-svn-id: http://dompdf.googlecode.com/svn/trunk@500 8e70de24-3a84-11de-b438-597f59cd7555
Bug in the HTML5 parser: if an invalid attribute name is present in the DOM, an exception was thrown

git-svn-id: http://dompdf.googlecode.com/svn/trunk@501 8e70de24-3a84-11de-b438-597f59cd7555
Wrong variable name
Floating table elements were transformed into block elements
Improved the examples page so that we can share links to examples

git-svn-id: http://dompdf.googlecode.com/svn/trunk@502 8e70de24-3a84-11de-b438-597f59cd7555
Images were not shown anymore in the examples

git-svn-id: http://dompdf.googlecode.com/svn/trunk@503 8e70de24-3a84-11de-b438-597f59cd7555
Merge remote-tracking branch 'remotes/svn/trunk'
fix for issue #26
remove full pylab import
attempt on issue #27
add asn files for OBJECT IDENTIFIER and RELATIVE-OID type.
by-DC debug fixes
Binary encoding of tokens.
Also promotes new gossip states: HOST_ID and TOKENS
Patch by brandonwilliams, reviewed by eevans for CASSANDRA-4383
Rename [value] to [bytes] in binary protocol spec to avoid confusion
Add ALTER KEYSPACE statement to CQL3

patch by slebresne; reviewed by xedin for CASSANDRA-4611
Fix parsing of consistency ALL in CQL3

patch by slebresne; reviewed by xedin for CASSANDRA-4659
ignore concurrent update (from old token owner)
Merge commit 'refs/top-bases/p/4443/010_refactor_range_move' into p/4443/010_refactor_range_move
Merge commit 'refs/top-bases/p/4443/020_calculate_pending' into p/4443/020_calculate_pending
Merge commit 'refs/top-bases/p/4443/030_relocate_token' into p/4443/030_relocate_token
Merge commit 'refs/top-bases/p/4443/040_tests' into p/4443/040_tests
Merge commit 'refs/top-bases/p/4443/050_process_queued_xfers' into p/4443/050_process_queued_xfers
Merge commit 'refs/top-bases/p/4443/060_shuffle_utility' into p/4443/060_shuffle_utility
update NEWS.txt for num_tokens setting
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4122/03_group_stream_out_ranges
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
Merge branch 'p/4122/03_group_stream_out_ranges' into refs/top-bases/p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
refactors the fill mechanism which now happens in the parser instead of a base class
Fix bug in Proc#call with passing arguments

This fixes the passing of args to procs as the arguments now line up
identically with normal methods so the args can just be passed
directly to the underlying .call or .apply functions.
adding specs2
handling query words that don't appear in corpus
reveal player cards at end
Remove the hack of resetting working directory to $HOME

That hack is added due to the the "single process" model used by konsole.
However, That hack seems to make the thing more confusing as reflected in bug
302903

So here is a known issue: if you set konsole as the terminal emulator
used in pcmanfm, pressing F4 twice in different folder will open two
konsole window in the same folder.
Almost works! add sleep
Added sleep
sleeps!
t really sure
Merge branch 'lab3_1' of https://github.com/adeeshaek/CS490

Conflicts:
	Spider.pyc
	clean/3.txt
	crawler.pyc
	dbwrapper.pyc
	header/3.txt
	raw/289.html
	raw/3.html
	searchtable.db
Modifed the dbWrapper to download webpage only if needed
"Hello, Build Event Hub Maven Agent!"

Change-Id: I1211205776b7763a09a54de2913e1179a3264fcd
Remove language environment variable
namespace downloaded repos by username
refactor repo cloning in worker
move github URL parsing logic to model
Add advertising
more log math
腰间盘突出
next zhiyan
Shuihusha AI 20121101 (V1.2.2 Stable)
swig 绑定出问题了
试试给 QObject 绑定一个 setParent(Card *) 的方法
=============
1、剧情模式统一ban掉礼物包
2、车轮战不准获得非固有技能
3、奇兵判断锦囊是否可对原目标使用
AI混战+场数限制（待测）
【喵星人最丢脸的降落方式】
猫咪身手敏捷就像忍者一般。
不过日本一只猫咪MARU因为怕高，落地画面显得很挫。。。。
所以主人才发现它怕高，决定将它平常休息、玩耍的猫跳台再改得更低一点，让MARU在上下时更方便。
不过，网友说，就算MARU跳跃的姿势不太潇洒，但还是超可爱（转）http://t.cn/zlgivNT
莫抽烟，少喝酒，健康幸福天天有
酒醉有泪，必有心苦；酒醉发疯，必有心怒；
酒醉嗜睡，必有心累；酒醉失眠，必有心病。
酒少人醉，必有心忧。逢酒必醉，定有心痴。
白酒伤肝，红酒养心，啤酒壮腰，米酒健胃。
酒后脸红，尤可近看；酒后脸白，最好远视；
豪酒伤身，多酒积病。酒可解愁更添愁，愁到酒后痴呆走。
用猫做微博头像的内心都比较自闭
用狗做头像的都胸大
用小孩和卡通做头像的都长不大
用暗色系做头像的都内心阴暗
用文字做头像的都很二
用风景做头像的都是小清新
用自己做头像的，男的是基友，女的有公主病。
一位父亲给女儿的三条人生忠告
① 对你不好的人，你不要太介怀，在你一生中，没有人有义务要对你好，除了我和你妈妈。
② 没有人是不可代替，没有东西是必须拥有。
③ 生命是短暂的，今日你还在浪费着生命，明日会发觉生命已远离你了。
Beef up foriegn keys with ON DELETE CASCADE.
This is correct for locks only when older messages do not survive newer
messages (which is the GC discipline I expect). Removing a new message
and its locks could cause an old lock to resurface.
eventloop: use MOWGLI_OS_OSX define and set up mach includes.
proctitle: use portability macros correctly
proctitle: more portability macro usage
proctitle: fix it for real
proctitle: more OS X fixes
proctitle: argh
proctitle: Remove mowgli_get_args().

If you need mowgli_get_args(), you are doing something wrong. The argc and
argv should be obtained from the parameters to main(). Code not explicitly
given access to them should not access them.

Also, both methods used by mowgli_get_args() rely on environ having its
original value. Therefore, calling it after setenv() or putenv() will
likely not work.
dns: 'when' argument to mowgli_timer_add is relative to now
rendered first file
Merge branch 'listado_ficheros'
Update examples/example_consume.cpp

AMQPMessage::getMessage() has been updated to new version
Removed an unused fs.stats call.
ut for python: heavy boilerplate.
implement queries (untested).
go fmt
included s1slowness
XMLUI: Update colors in CGSPACE theme

Adjust some text and borders to be a less-bright variation of orange.
We depend on texlive-most.
Creating registration html. Moved images.py api to public.
fixed do_if_form
styles for new homepage layout
Make homepage layout fluid (to a point)
fix popup mask styles for ie6
Homepage section link colour
Merge branch 'homepage-iteration'
Adding revised gov.uk logotype with the inclusion of the word BETA
Rename classes to match plugin name
Adding shutil dep to kernel.sources
remove an alias declared in git-plugin.
remove unused aliases.
Attempt to make setup.py succeed without cython.
Add note about cython to install.
oooh CSS teaches patience
Use exceptions.handle() to handle exceptions properly.

Change-Id: I037456b64b2b2f813eafdd886826087578544fc9
Update copyright notice.

Change-Id: Ieb187b79dc0441bd9391642e92fd63c569617717
Address pep8 and pylint issues.

Change-Id: I312080278ae41847d3fe817aa87e0c2a8549ab9c
添加第二个参数(父tQuery对象)的支持
gvl: Add 'permanentCursor' attribute
glw/text: Fix some issues with text caching inside widget
gvl: Add a new property 'corderRadius' on image widgets

This property will etch rounded corners on the pixmap
glw: void on vec4 attribute is same as [0,0,0,0]
Initial stab of a native on screen keyboard
skin: Add missing alpha+blur on tiled home screen
Fix bug that caused "off" as a subtitle/audio track option to disappear
ps3: panic() on out of memory conditions
ps3: Increase available memory for malloc() to 96MB
ps3: Fix network lockups during high amount of IO on multiple sockets

Lower SO_RCVBUF from 512k to 128k
After the TCP_NODELAY fixes the 512k setting seems unnecessary

Fixes #927
Remove the progress spinner when not in use so that the "Load more..." text is centered.
Strip RE/FW from the MessageList subject line for thread subjects.

"Be like Outlook."
Five new functions, to-do list
added rhsh
add new job with key
remember by minus
Improved testdata to be more random and fictional
Fixed bug, skip user if logins list os empty
fixed comments
Changed empty sequence comparing
Add ability to generate a deterministic UUID from a string value
Add support for solution groups
Fix for older version of sudo + some changes to imports so tests are happy
猎人灵狐删除
good for me
Merge pull request #7 from anson0370/nameplates

if is better
为小地图下拉菜单增加loot histroy frame开关
better title
Merge pull request #9 from anson0370/minimap_menu

Minimap menu
头像颜色问题
spell interrupt fix
Merge branch 'master' into myBr
fix again
ACCUMULO-408 get the bulk functional tests working

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1424060 13f79535-47bb-0310-9956-ffa450edef68
objects view comparitor added
add lookup for classes within package for when api is implemented
objs view action buttons reordered to match sort alpha sort order
fixed intial load of capital medical
fixed header height
added time zone for display
added doctor name in template
changed form name
build profile for boy scout after signup
Add week 1 topic.
commons-logging dependency must be scoped for compile
tweaks report styling
fixes pdf rendering of reports
Add new route for users profile
more options in user menu for admins
add test for filtering tags
add focus for rspec
Fix: added posts, comments, and favorites to users controller
Use "wiring" (not "stk500v2") avrdude protocol for uploads to Mega 2560.

It performs the auto-reset in avrdude.  Otherwise, some uploads seem to fail (possibly because it takes too long to launch avrdude from the IDE, so there's too much of a delay between the auto-reset done by the IDE and the upload).

http://code.google.com/p/arduino/issues/detail?id=806
Fix changing directories on old Python versions.
write to file when doing get
Update web site to mention version 1.5.
Fixing the "request.url" field, excluding symbols '/', '&' and '#' from "percent encoding".

Well, it's not really necessary for '#' but I'm just being safe (non-browser clients).

http://code.google.com/p/phantomjs/issues/detail?id=437
Extend printheaderfooter.js example documentation

The comment now explains how to delegate the header/footer setup
to the loaded HTML page by giving an explicit HTML example that
defines the required PhantomJSPrinting object

ISSUE: 512 (http://code.google.com/p/phantomjs/issues/detail?id=512)
Fix various compile errors and ambiguities.

- Fix incorrect usage of getLastFPS() without render window reference.
- Add missing constructor and destructor definitions for IGraphicalChangeAdapter.
- Move FurtherChangePossibleAccumulater structure to the header for easier use.
- Fix ambigous use of FurtherChangePossibleAccumulater in definition of signal changeRequired which caused signal template to use signal2 which takes two arguments instead of one. This is a more explicit way of using an accumulater while defining a signal.
New assembly
Merge branch 'master' of https://github.com/artagesw/FROIDZ
Create a separate error log for uncaught exceptions.  Closes #13.
rm unuse task
Will now remove invalid entities from the list while running the scene editor
Broken test entity
[enh] opml support added
[doc] opml support added
[doc] easy_install example
Make the server_name configurable with a sane default
Fix missing bits and typos
optimize ftrunc flush. flush only if buffer is inside trunc region|
Add scoped stack allocator for non C++ types
Misc ansi fixes
Some comments and code tidy-up.

Moved delegates to be members of CalcEngine
notes - Compilers + SNA - lectures.
Almost there, just some cleanup required...
Larger font size for alternative name.
renamed astropy.config.configs to astropy.config.configuration to reduce confusion
Functies gescheiden van de PHP
haskell bindings
no dist
pubic domain
Merge pull request #6 from mikeplus64/master

Haskell bindings
+Added simple channel ListView
updated descriptions, 0.1.4
Switch-to-minibuffer added
Fix volume keys
Update Conky colors for new wallpaper
Update Vim border color for wombat theme
Update Xmonad .gitignore
タブ入れ替え機能の改善

$.fn.sortableを廃止してUI.Tabにソート機能を内蔵

close #95
.tab_tabbar関連のイベントを.tab_tabbarに割り当てるよう変更
add "-l" option to umount command.
nwmon: add language translations.
Freeze the algorithm to selected.
Changed the default 'vifs parameter' to more properly emulate the real one
Add spec for the 'dunst' package
Make JavaScript files of the backbone-rails gem available - rails/rails#2443
Merge pull request #22 from frodsan/patch-1

Make JavaScript files of the backbone-rails gem available - rails/rails#...
warn: fix edit summary for {{uw-username}}
Adding ruby-srp and including SRP::Authentication in user model
add json call
Set artifact version to 0.9.1
Obtaining lzma-sdk-j4 from central repository
Merge branch 'release-0.9.0' into dev
added file ownership attributes
Fixed issue 993, wrapped text with no spaces loses a character at wrap point. Oh god I've changed the text wrapping code. :( Happy testing!

git-svn-id: https://libgdx.googlecode.com/svn/trunk@4488 6c4fd544-2939-11df-bb46-9574ba5d0bfa
sync_auth_info
Fix html5shim url
Put jquery.js before html5shim
commit for "stable" backup
sync commit
Merge branch 'master' of ssh+git://git@github.com/bartvbl/ORRE-V2.git

Conflicts:
	ORRE-v2/res/reslist.xml
	ORRE-v2/src/orre/resources/partiallyLoadables/UnpackedGeometryBuffer.java
Updated comments/default from review - thx @russelldb.
getting crazy on this mofo
switch unicode pseudo hyphen char to ascii hyphen char
minor edits to SELinux note
title tweak
removed potentially confusing link to self
don't load pymode lint plugin until vim compiled with python
Merge branch 'master' of github.com:bbinet/dotfiles
update jslint submodule
Added Rubinius to a list of Ruby interpreters compatible with WebMock
BCView Menu
Finish chapter 5 exercies (part 2)
Bump copyright year :)
now use Object.keys() to iterate over object keys.
GH-149 - Make posts and profiles visible without login
add support for customBars into DataTable parsing
Mark debug message functions static
Fixup hb_ot_shape_closure()

Broke it when merged cmap mapping and normalizer.  Ouch!
0.9.5
Fix bug in graphing
Encode unicode values as utf-8 when building url in oauth2.Request.to_url.
This fixes a bug where utf-8 encoded GET parameters are decoded back to unicode during oauth signing and to_url just tries to encode them to ascii after signing, which fails.
Merge pull request #106 from jengdal/master

Encode unicode values as utf-8 when building url in oauth2.Request.to_url.
Changed project name of the skeleton module at server git depot.
Removed the usage of eval ('evil') in maintainer run script.
Added G_3NOR2.vhd.

Signed-off-by: Bert Timmerman <bert.timmerman@xs4all.nl>
use re-enabled recordedInverseMicrobarns
feedback: Raise feedback IRQ priority
uart: Re-enable DMA

Things seem to work now
feedback: Enable timers after reconfiguration if feedback running
More text tweaks
Rework "science should be open" section
system() function