labofsahil/github-event-dataset-2012 huggingface dataset:
we no longer store the item separator at the start of strExtraGenres/Artists
additional slashes appended to artist/genres in music library. fixes #12917, #12894
one more item separator weirdness in the musicdb
jsonrpc: add FooLibrary.OnScanFinished notification (introduced by 816bab69) to introspect
jsonrpc: fix c/p monster in VideoLibrary.OnScanFinished (thanks thedroid)
only execute the actor table update if the thumb URLs isn't empty - fixes #12905
[WIN32] fixed: some wrong entries in the project files probably due to merging.
avutil: add av_get_default_channel_layout for later use.
Use libavutil::av_get_default_channel_layout instead of the private libavcodec::avcodec_guess_channel_layout

The latter has been removed in ffmpeg git master.
DllAvCodec: Remove now unused private avcodec_guess_channel_layout.
adjust remote.xml after 72ae0599b30ef48a0c3a49455955b3c76f75d026
Merge pull request #880 from aballier/master

[ffmpeg]: Use av_get_default_channel_layout instead of private version
Merge pull request #881 from FernetMenta/remotexml

Adjust remote.xml
[win32] in VS project move MediaSource.cpp into utils folder (where MediaSource.h is located)
fix: rename SPyEvent in PythonMonitor to avoid clash with PythonPlayer
cosmetics: cleanup the songview creation
left join the thumb and genre tables in the songview so that songs without thumbs or genres show up. Fixes #12927
ensure strPath in the path table is converted to utf8 on update, thanks to jenlain62. Fixes #12872
changed: Refactor CDVDInputStream to fully expose SCacheStatus + properly detect too low read rate condition when cache buffer is full (fixes ticket #12820)
Merge pull request #879 from arnova/dvdplayer-cache

Refactor CDVDInputStream to fully expose SCacheStatus + properly detect too low cache read rate
[rbp] added libshairport to depends
Add new French translations

Closes #246
Add German translation for (un-)following

Closes #249
Update Slovak locale

Closes #250
Add ability to star/unstar repositories

Closes #236
Remove extra newline
Rename StarringRepositoryTask to StarredRepositoryTask
Organize imports
Rename isStarring to isStarred
Rename starringStatusChecked to starredStatusChecked
Rename checkStarringRepositoryStatus to checkStarredRepositoryStatus
Refresh repository list when viewed repository is changed
Remove installLocation attribute

Forces a re-login when the SD card is mounted if the app
is moved to the SD card.
Support navigating up from CreateGistActivity
added german locale for star/unstar repositories
Remove duplicate strings (star/unstar)

Closes #253
remove duplicate string (unstar/star) from default locale

Closes #254
Memoize octicons typeface
Store view and extra variables from onCreate
Update French translation

Closes #258
Use super class helper for getting serializable extra
more pre-release cleaning
not this problem
Bug Fixed in Acl management for No permission
Turn git exe into a singleton
Put abbreviated hash into snapshot filename
Cache git exe version
Add decoding png function for Save Dialog
Merge pull request #21 from Xele02/master

Add decoding png function for memory data
Add audio to Qt frontend
Changed x86_64 toolchain target to x86_64-unknown-haiku.
Clean admin content_controller (use simple_editor? and fix insert_editor action)
add test on insert_editor action on admin page_controller
Making the dashboard a little bit clearer, and the info style a little less flashy
Making the simple editor a little clearer
Setting up things so we can soon (or later) add a second administration color stylesheet (or two, or three...). I have some nice ideas you can easily imagine for that one
Adding bootstrap dependencies, switching layout and menu to bootstrap
Removing dependencies to Twitter bootstrap, html cleaning
add rbenv-version to gitignore
Merge branch 'master' of github.com:fdv/typo
Moves Dashboard to bootstrap
Articles / content
Porting the comments view to Bootstrap
Correct specced admin theme configuration variable.
Remove needless #delete_all method calls.

There are no fixtures, so there's nothing to delete.
Remove superfluous bits from Gemfile.

- Since the code above them works, the require statements are not needed.
- GemCutter is history.
Merge branch 'master' of github.com:fdv/typo
Add back source line to Gemfile.
Merge branch 'master' of github.com:fdv/typo
Moving login form to Bootstrap
Adding a quick and dirty fix to users won't have to ssh and run initial migration: if the fire triggers fails it's most probably because the database was not loaded, so we run the migration engine as a rescue.
Split migration and envs-pclasses down test

Splitting migration's up/down into 3, skippable steps.
Permits creating the necessary column/join_table,
migrating, and removing the obsolete join_table/column,
in separate steps.
The migration test case puts the DB in intermediate state and skips
the deletion.

Fix destructive usage of the mapping structure, breaking ulterior steps.

Added environments m:n puppetclasses relation in down + test.

Truncate environments m:n puppetclasses join table.
Use delete_all instead of destroy_all to bypass validations.
I had a problem with a validation on nil using destroy_all
on environments_puppetclasses.

Asserting setup state

Additional, non-tested-yet fix:
Fix host and hostgroup puppetclass merging.
(using map doesn't change the association without affectation)
Passage de l'inspection intelliJ
Roles separation for User model, Added Service model

Basic signup procedures made for people and startups respectively
Remove "encoding=utf-8" from Vim modelines

Signed-off-by: Corey Thompson <cmtptr@gmail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
let g:miniBufExplUseSingleClick = 1
...asdfjkl
add a screenshot for the RStudio compile button, and another instruction on installing knitr
run knitr
makemefeel
INFINIBOX-2213: Escape characters when displaying variable strings
Lisätty ajankohtaista
Alteracoes 006
bump us to the latest version
backport deep_munge from rails 3 to fix CVE-2012-2660
update deep_munge to resolve CVE-2012-2694
patch SQL injection vulnerability (using official issued patch) and close CVE-2012-2695
FLUID-4788: Provided a test cases where init function is not fired for component of newly created grade.
FLUID-4791: Fixed an issue with removing listener by namespace. Added unit tests.
FLUID-4791: Economised unit tests
Merge branch 'FLUID-4791'

* FLUID-4791:
  FLUID-4791: Economised unit tests
  FLUID-4791: Fixed an issue with removing listener by namespace. Added unit tests.
FLUID-4799: Fix and test case for "double global name listener" issue
FLUID-4788: Accumulate default init functions through the grade hierarchy
Merge remote-tracking branch 'amb26/FLUID-4799'

* amb26/FLUID-4799:
  FLUID-4799: Fix and test case for "double global name listener" issue
Merge remote-tracking branch 'amb26/FLUID-4788'

* amb26/FLUID-4788:
  FLUID-4788: Accumulate default init functions through the grade hierarchy
  FLUID-4788: Provided a test cases where init function is not fired for component of newly created grade.
FLUID-4780: Temporary fix to Tooltip for dynamic content update; will be cleaned up on upgrade to jQuery UI.
Merge branch 'master' into FLUID-4780
Merge remote-tracking branch 'acheetham/FLUID-4780'

* acheetham/FLUID-4780:
  FLUID-4780: Temporary fix to Tooltip for dynamic content update; will be cleaned up on upgrade to jQuery UI.
FLUID-4732: Fixing inlineEdit namespace. Now users can use fluid.inlineEdit which will be properly resolved as IoC component.
Merge branch 'FLUID-4732'

* FLUID-4732:
  FLUID-4732: Fixing inlineEdit namespace. Now users can use fluid.inlineEdit which will be properly resolved as IoC component.
FLUID-4842: Configurable error handling behaviour for fluid.fail()
FLUID-4842: Adjusted order of activites in fluid.fail as per review comment
Merge branch 'FLUID-4842'

* FLUID-4842:
  FLUID-4842: Adjusted order of activites in fluid.fail as per review comment
  FLUID-4842: Configurable error handling behaviour for fluid.fail()
FLUID-4842: Improved comment for fluid.fail
Merge branch 'FLUID-4842'

* FLUID-4842:
  FLUID-4842: Improved comment for fluid.fail
comment clean up
comment clean up
fixed merge conflicts
pairing backend
fixed issue with lingering notifies on profile page
Refactor SeamAutowire.

More understandable API and clearer code.
Change Seam Tests to regular Rest Tests.

Using Seam Autowire, Rest tests no longer need a full Seam environment to be validated.
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Work in progress: glossary upload via ui
Work in progress: glossary push via web
work in progress, glossary upload via ui
rhbz804871 - add close button to translation history popup
rhbz844820 - fix problem: user click on buttons at different row should ensure row selection event first
rhbz844820 - fix css style for transUnitDetail and validation panel after merge
Implemented glossary upload/delete via ui
rhbz844820 - change all image buttons to fontello css
Fix firefox css, fix test
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Fix notification text color and position with new side menu
rhbz844820 - change undo link to icon and adjust layout
rhbz844820 - fix bug

- keyboard shortcut context is not set correctly
- undo icon insertion
- ensure row selection before copy source action
rhbz844820 - add undo tooltip
rhbz844820 - style of buttons
rhbz844820 - remove gwt incubator dependency
rhbz844820 - fix bug change document will reset page count to wrong value
Merge branch 'master' into okapi-filters
Attempting to see if changes will dissapear
adding playlist (cart) functionality
fixed a few issues in audio_releases_controller spec and audio_file
ajout recherche
Merge branch 'master' of github.com:zeld1/miniSIG
minor playing changes
Merge branch 'master' of github.com:zeopix/Gaming
fix a bug : save path from CML with -d
Now that we have the new staff pictures uploaded we needed a space on the contact page to feature each of them.
Merge pull request #13 from zmam40/add-new-staff-squares-to-contact-page

Add new staff squares to contact page
banner should match year theme
no t for jason
no longer need old staff photos
* configure.in: update AC_INIT usage, specify tar-ustar and minimum
  automake version.
* config/amanda/version.m4: create new AMANDA_INIT_VERSION macro to
  read FULL_VERSION or VERSION before AC_INIT.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/branches/3_3@4707 a8d146d6-cc15-0410-8900-af154a0219e0
DNA & RNA
removed bytecode, updated giignore
Added option to extract full translation for each locale
Tweak to processDocuments
增加了更多的控件
able to generate solr schema
Revert "Test from SS"

This reverts commit 4fbb085c339ec0cfdb9964bdc86ed94d6d4ea602.
难题index UI
Add a hook on `application`.
Spelt my name correctly
Prime Finding Algo
Comment.
More sensible default package environment.
Implement the 'inherit' setting.
Remove some duplication.
support link added to README

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Try delete README.asciidoc to force GitHub re-generate the initial page

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Revert "Try delete README.asciidoc to force GitHub re-generate the initial page"

This reverts commit a96c878f7fc93a05ebd88054abed3861fec7342a.
adding beforeEach snippet for jasmine
adding snippet for immediately invoking function expression
标题: 自定义 git

内容:

配置颜色和提交信息模板

[ticket: X]
added new madcow operation hasClass for checking an element has a certain class…
Rake and towards dotfiles.
A little desc for `rake -T`
Adding Project Euler Problem 18
perhaps this is the reason why the plugin stops working properly after a while
Made capacity and reserve pure nothrow.

I don't see any reason for these not to be pure and/or nothrow, and
their lack is problematic for pure functions (and to some extent,
nothrow functions, though try-catch can fix that as tedious as it may
be).
fix Issue 8274

- drop rt_stackTop/rt_stackBottom
- add thread aware replacements in core.thread
create coverage and profile output lazily

- in shared libraries all module ctors/dtors are always executed so we
  must only create output files if these modules have actually been used
rename test to benchmark

- make room for a test suite
ModuleGroup

- bundle rt.minfo functionality in a new struct ModuleGroup so it can
  be accessed/reused for shared library handling
m_state can be HOLD

- reset is also called from the ctor so the state is HOLD
- because tstack == bstack we know it's not a paused fiber
Merge pull request #249 from dawgfoto/fix8274

fix Issue 8274
Added non-generic aliases for core.time.dur.
Merge pull request #251 from dawgfoto/lazyCovNProf

create coverage and profile output lazily
Merge pull request #253 from dawgfoto/renameTestFolder

rename test to benchmark
Merge pull request #254 from dawgfoto/ModuleGroup

ModuleGroup
Merge pull request #255 from dawgfoto/fixContract

m_state can be HOLD
Merge pull request #147 from jmdavis/reserve

Made capacity and reserve pure nothrow.
Merge pull request #260 from jmdavis/seconds

Added non-generic aliases for core.time.dur.
Updated changelog for aliase for dur.
Тестовые изменения
Merge remote-tracking branch 'origin/master'
fix not changeable uri (resource widgeti)
Attached the new Sparlqify code to the REST server
Minor fix for !bound
Double click a friend to send a message. Chat window now correctly displays and binds to the status of the friend.
Added support for /me.
Graphical polishing. Adjusting buffering time. Made sure the 'Unable to connect' notification only shows once.
Modifications affichage
Merge branch 'master' of http://github.com/Anaguiros/Hadl.git
Rename "the command may start after": s/may/must/
[fix] imaging : bracket error
Merge pull request #102 from tekmans/maymust

Rename "the command may start after": s/may/must/
samba: correctly read ldap passwd sync option
doc: add MDS QA test
doc: update MDS qa tests
Fixes #1868 : Light Pull mode
imaging: PostInstall to BootService improvements

 * Don't display create BootService icon if BootService already created
 * Add FK BootService id in PostInstallScript table
imaging: Show in web interface if boot service is Used or Not
imaging: Can now delete BootService created from postinstall

 * Delete Boot Service in DB
 * Delete sh file previously created by postinstall
imaging: Give Boot Service id as sh script name

... instead of PostInstallScript ID

Reason: If we create BootService from a duplicated PostInstallScript
and we delete this one, we can't in future delete BootService (because
of script name based on a deleted PostInstallScript)
imaging: BootService define action for Boot service already created

Replace empty icon by a ro-icon
Redirect to boot services page
core: move imaging CSS styles to imaging module CSS file
imaging: add confirmation popups before creating Boot Services

from postinstall
base: adding missing CSS for add/del boot services
imaging: add recursive removal of boot services feature

Same behavior of recursive removal of masters
imaging: fixing missing $type for recursive removal of masters

and variables renaming for recursive removal of boot services
core: test if the sidemenu exists
mds: no pass-by-reference on php 5.4
added re-focus on tab change, so your focus is restored to where you left when changing the prails tab
improved open item search to also look for contents rather than just names
fixed JS error when focussing quick open field via shortcut
osdc/ObjectCacher: only return ENOENT if ObjectSet is flagged

The fs client can't handle ENOENT from the cache, but librbd wants it.
Also, the fs client will send down multiple ObjectExtents per io, but that
is incompatible with the ENOENT behavior.

Indicate which behavior we want via the ObjectSet, and update librbd to
explicitly ask for it.  This fixes the fs client, which is currently
broken (it returns ENOENT on read).

Signed-off-by: Sage Weil <sage@inktank.com>
Merge git://github.com/ceph/ceph
vstart.sh: let you specific specific ip to bind to

e.g. 192.168.122.1

Signed-off-by: Sage Weil <sage@inktank.com>
Allow floating IP pools to be deleted

Fixes bug #1022237

If you delete all the floating IPs associated with a floating IP, the
pool still shows up in os-floating-ip-pools extension.

Fix this by using model_query() in the DB layer so that we ignore
deleted floating IPs.

Change-Id: I30d2e716e931400ca4b798b51bb26a73a7747808
Handle NULL deleted_at in migration 112.

A NULL value in `instance.deleted_at` will cause the migration to break.
In the absence of instance deleted_at timestamp, we should be
conservative and skip cleanup.

Fixes bug 1029129

Change-Id: Ieb978281bc55727fb7db02ddc8c3e0fd6c8814f0
Merge "Allow floating IP pools to be deleted"
Merge "Handle NULL deleted_at in migration 112."
adding openshift prod web.xml
Add You Mad?
Add O Kawaii?
Add Portal Cake is a Lie
Add Pics or it didn't happen
Add I Don't Know Therefore Aliens
Add facepalm
Add Dat Ass
Add Happy Xzibit
Add Do It Faggot
Add For the Lulz
Add Hello This is Dog
added required configurations for domainbus project.
Logs every faye message

Signed-off-by: Akash Manohar J <akash@akash.im>
TaskList Temp Fix
coderus patch
Whoops! wrong place!
* Refactored `bns_login_main` to use hooks instead of array elements; documentation updates
Updated with intructions about config.txt
net updates and a broken cipher
add help macro
update gems
updated mail chimp gem now raises errors instead of returning a string.
ae.utils.zlib: Correctly handle empty input
Merge branch 'master' of github:CyberShadow/ae
建立两个工程。

Signed-off-by: CyberZHG <443442708@qq.com>
Create new solution structure
Store got moved
Implemented World.updateBlock()

Signed-off-by: narrowtux <narrow.m@gmail.com>
Use blank worldgenerator as a fallback
Improved PlayerChatEvent throwing to not throw for commands.
Moved EntityEffect stuff to Vanilla
Using SpoutNBT library
Kick with message rather than disconnect
ServiceManager implemented from sk89q.

Signed-off-by: Sleaker <sleaker@comcast.net>
Merge pull request #1582 from Sleaker/master

Adds service implementation to the server
Formatting
Added RecipeManager

Signed-off-by: Olloth <olloth@gmail.com>
Pass a Random to the populators
Get a random seed for the world
New Movement, Rotation and Velocity System
Improve handling of exceptions thrown by commands a bit
Merge remote branch 'origin/cached_movement'
Revert "Merge remote branch 'origin/cached_movement'"

This reverts commit 37b063f098a69db4a0ceca40cdd3bf65c7f43036, reversing
changes made to d465a721ed30b909099394e89f08d3fdb232bae8.
Revert "Revert "Merge remote branch 'origin/cached_movement'""

This reverts commit bed9b81c78a208a015bc830d6e3bd4111fa4d5a4.
Revert "Merge remote branch 'origin/cached_movement'"

This reverts commit 37b063f098a69db4a0ceca40cdd3bf65c7f43036, reversing
changes made to 4ea60bc63893741570981fd79268e82db9db3d12.
Partial saving
MT_FARPTR multi-byte access was wrong.
ValueMember should cast to char* as an intermediary, since that will have the right arithmetic properties.
Adjusted BinarySub to handle far pointers like BinaryAdd.
added: ModCode#min / ModCode#max
16-bit add
text-align:right
Update unit tests in Zend\Mvc for controller event() change

ActionController::events() does not lazily instantiate an EventManager
anymore. Tests are now updated not to depend on this behavior.
tests/qwery: removed all tests for "relationship-first queries"

http://stackoverflow.com/questions/10790879
modified pvalue to threshold calculation method in centrality utils
Merge branch 'p_integration' of https://github.com/FCP-INDI/C-PAC into p_integration
Add a whole wireframe
Added description of some acronyms
~ Normalized imports
! Datum im Protokoll
Merge branch 'master' of ssh://github.com/Feuermurmel/ba
naming and style fixes in connectiondialog.py
Fixed some problem with instance IDs
Increment version number to 4.2.1
fixing replace bug with undefiend value
Änderung Rückgängig gemacht
Make selction background visible. [#648676]
Updated Spanish translation
Updated Slovenian translation
Fixed typos in strings
Updated Spanish translation
Added timer and randomly sized walls
Add custom command for Github Status
Fix formatting
new file:   test/aio
	new file:   test/main.cc
	new file:   test/makefile
add logic for creatiing rule
Privacy Module
Anpassungen Privacy
Language bei Contact, Anpassungen in Appl.config, docText in Training Module
added costheta with reco particles but in true top cm frame
encapsulating HUD
scene gameover with tryagain button
warning when pass to next level
fixing clicking fast bug
APIのキャッシュ処理実装
Merge branch 'master' of github.com:Hweb24x03/barI
add gitignore
add index
trying the webform_report module
Setting Date in expenses
fix issue #1
Uploaded draft of requirements from forum
[add] BignumException class
deignore *.apk
switch back not needed anymore
Added nomenclature document.
Add jpaPropertyMap configuration to spring-database.xml
Change the CSS parser reference from cssutils to tinycss
Implemented ForkPrivate and DeletePrivate in the template editor module.
Added temp e switch to template functionality.
Merge branch 'master' of https://github.com/opesun/hypecms
Merge pull request #15 from Laller/master

Admin design.
Merge pull request #16 from Laller/master

Admin design.
Modified color of autocomplete box, also deleted css rules from the js file and moved it to the tpl.
More sensical descriptions.
Moved jquery 1.7 to shared.
Convert handles another corner case now.
Implemented a basic text stemming/fulltext indexing thingie.
Seriously don't know what changed here.
Added icon to show position on admin interface.
Smarter convert, separated special field names into constants.
Modified special field names so they include foreign collection name and will be resolved automatically.
Implemented fulltext search and began impementing configuration of content types.
Fixes #18 and does some UI refinements.
Can display json dat at error too now.
Corrected small typo/bug.
Minor login cleanup.
Added paging. Closes #20
trying to resolve circleci problem 4th try
Update src/br/com/caelum/tarefas/controller/TarefasController.java

Adicionei um @RequestMapping() apontado para a página menu.jsp, fiz essa alteração com o intuito
de possibilitar a adição de botões e/ou links para essa página a partir de qualquer lugar do sistema,
desde que haja usuário logado
Removed some extraneous commands.

Removed default response to a comment with a '!' in front of it.

Removed reddit updates.

Changed eject to use config-based channel name.

Gave print_help a shortdesc and longdesc.

Changed !hoggy command to be based on the bot's name in the config.
Revert "dodanie klasy klienta czatu tekstowego"

This reverts commit 35f048b20e6cc8c937d289de17a3933494e916e5.
Add a stat value
Lo arregle para que compile
FButton AddLabel return a reference to the label
iredges: introduce new reroute_edges_except

I expect this to be a common pattern
avoid "Unknown" hacks with reroute_edges_except
normalize Sync node by sorting their inputs

This also makes the compiler alot more deterministic avoiding, lots of
"random" jumping around in series of stores and loads.
make compiler more deterministic by sorting Perm inputs
bespillslots: cleanup, make it deterministic
added saving gui state

 * which currently only saves the text in the search box.  AWESOME FEATURE!
upgraded build scripts

 * Increment-Build-Number now actually just sets a static build number
 * Set-BuildTime, newly added, sets the time that the build happened
 * Updated build numbers to "1.3.0.0"
 * Updated the "about arcadia" dialog
 * Updated the main window title to "Arcadia Preview 3"
moved "About Arcadia" window logic to its own class
updated AboutWindow to use StringBuilder
updated AboutWindow's properties to be regular methods
WebSocket Message File
Little geometry examples.
fixed problem on merge
Merged back api slides from dummyexp branch
完成 High DPI Hack
added module taxonomy_breadcrumb
added oh-my-zsh and zsh config
Various changes
Added plugins to .zshrc
Added git and git-flow plugin to zsh
Fixed publishing fuck up
Added BSides
feature #1508: Add --keypair option to econe-run-instances
(cherry picked from commit 8a0dbcd9965def8f4ff19e533b03f13f048729f5)
Fixed flaw in makefile and updated todo list.
Added remote.origin.push git config
incode comments
Merge branch 'master' of github.com:PSE-2012/MMWTV

Conflicts:
	Entwurf/Entwurfsdokument/TemplatePflichtenheft.pdf
modification de la premire fonction pour tester le merge sur la meme partie du code.
bug 000: Test de cycle de developpement 3, essai de merge difficile, supression des modifications
Added receive type
organised files, made tiny toolkit a submodule
signed contributors agreement
Merge pull request #656 from kroman0/patch-1

signed contributors agreement
oo inheritance working
any supported type can be used as plist root, not only dictionary.
Character Statistics (vid 11-15)
support commonJS in browser
big refactoring before introduction of SailGraphBackedFinderService for
#15
As tests are all green, I consider I can go forward and add that class
(of course, some things may fall down ... but only in that class !)
refactored tests to allow writing of SailGraph ones
refactored tests to allow easier extension to SailGraph
refactoring was far bigger than what I initially thought
Ajout repo "plat en cours"
commit chu
Test Commit
Another test commit
Yet another test commit
Merge https://github.com/RobDF/RobsTest
add test case of magic.Calendar.$timer
add content
add empty file
added typed properties, published artifacts
Add missing comma in Brightcove json output
NXT Handlers
updated locomotion for nxt
removing useless custom control file
u6 cte task
Updated Build - Fixed animations

Build V1007
~ Animations was not looping, this was due to a small error. Fixed.
use proper ssl url for the redirect or twitter will force a signin
refactor: remove unneeded %div in HAML
Merging in changes from dev to mygarden branch
Oops, missed a bit with the merge.
Made the form require login and look slightly prettier.
Fixed broken tests.
Added edit button to garden page
closer….
Fixed configuration bug and modified the click handling to transfert enchantments and durability.
Fix ubuntu detection
Fixed the radial blur shader.
Revert "Lighting system base implemented"

This reverts commit 68e398cb5a02a49bdcdc3fd0d9386ca5c1cb5082.

Conflicts:

	src/main/java/org/spout/engine/world/SpoutChunk.java
	src/main/java/org/spout/engine/world/SpoutWorld.java

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
increase the populate queue, since the server isn't doing enough work
When an exception is thrown in addPlayer, we still need to connect ;).

(Note this may have broken input but login is stable again).

Signed-off-by: Chris Sanders <zidane@outlook.com>
Added a null check

 Signed-off-by: Jack Huey <kitskub@gmail.com>
Merge pull request #2148 from kitskub/a0fc5ff8c446fbc9cd4dfbefc68c9884e5dcdf61

Added a nullcheck to cancelTask
Script changes for the Full PhysX Template to remove the scripted numerical health hud, replacing it with the c++ GuiHealthTextHud GuiControl.
Add fizz buzz file
adapted to changes, further enabled madelview separation.

ax5utils updated, and these changes were adapted to.
Most of the standard shader pipeline was worked out of the program.
Bumpped nagios version to 1.10.0
Merge branch 'master' of github.com:Tealium/nagios

Conflicts:
	metadata.rb
InteractionFragment이동 수정중
임시
삭제 관련 수정중
모델 삭제 수정중
Merge remote-tracking branch 'origin/master' into MoveFragment

Conflicts:
	org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/command/ApexMoveInteractionFragmentsCommand.java
	org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/command/ApexSetBoundsForExecutionSpecificationCommand.java
	org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ApexConnectionMoveEditPolicy.java
	org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/edit/policies/ApexMessageConnectionLineSegEditPolicy.java
	org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/util/ApexOccurrenceSpecificationMoveHelper.java
	org.eclipse.papyrus.uml.diagram.sequence/src/org/eclipse/papyrus/uml/diagram/sequence/util/ApexSequenceUtil.java
SEQ-LL-028 수정 중
SEQ-LL-028 수정 중
SEQ-LL-028 수정 완료
SEQ-CF-028 완료, 027 재작업중
Resolve flee bookmark when closing UI and warn if not valid
Merge branch 'tehtsuo' into vendan
Merge branch 'experimental' into vendan
Fixing obj_State clear system

Now you can clear and queuestates and then return TRUE
This is semantically clearer, as it preserves the return TRUE means
state done
Initial deadspace bookmark support

Should ignore live pockets and salvage all pockets
Note, buggy on live worlds collide, should work after mission complete
Prevent retargeting of already salvaged wrecks
Do without while
Automate should complete launch command even when started while in game
Sped up TargetList
Merge remote-tracking branch 'origin/vendan' into tehtsuo
Added check for DronesOut on obj_Drones init
Loading and saving of maps is finished and working.Creates a map data file to save the image file name, the resolution, and the offset of the image relative to map origin. The map itself is saved as a Png image.
basic working TcpSocket class
making networking more robust
Fixing user theme selecting(http://ctrev.cyber-tm.ru/tracker/issue-93.html)
replaces c ATs with python
Fixed little escaping problem in DatabaseService
Added tests for DatabaseService
Fixed error related to namespaces
Scaffolding.
POSSIBLY BROKEN intermediate commit to replacing storeInSQL
Able to store data in the database.
It's working. It's WORKING! Updatable refactored into core Adapter code.
Rearranged to make tour an adapter, not a model.
Minor fix for spec failure
Renamed & updated specs.
Fixed tourjs adapter spec.
There, JSHint. Are you happy now?
Further refactoring into _Adapter
Fixed some major errors, oops.
Undid the hitch and now it's off to the races!
Removed cats from version guidelines.

Numbers are less ambiguous (and have fewer claws).
Merge branch 'develop' of github.com:Toura/mulberry into develop
Merge pull request #563 from futuraprime/adapters-setup

The initial refactoring to set up adapters in the mulberry code.
Merge branch 'develop' of github.com:Toura/mulberry into develop
Merge branch 'release' into develop
Android 4.0 support fixes.
Added ios build back in
Merge pull request #567 from thegoldentoilet/b-ICS-fix

B ics fix
split up library and added ply
OS/FileUtil: add function GetSize()
Infoboxes: Use 'GR' not 'LD' for glide ratio over ground

Usage of 'LD' / 'L/D' / 'L/D ratio' to refer to 'glide ratio
over ground' is incorrect.

Resolves #2023
Specify 'glide ratio' as 'glide ratio over ground'/'lift/drag ratio'

'Glide ratio' is a non-specific term which can refer to the ratio
of horizontal to vertical motion with reference to either the airmass
or the ground.

Usage of ground-referenced glide ratios are referred to by the term
'glide ratio over ground', or 'glide ratio' / 'GR' for short.

Air-referenced glide ratios are specified as 'lift/drag ratio' /
'L/D ratio' / 'LD', which is equal to the air-referenced glide ratio
when flying at constant speed.
Variables: Use 'gr' abbreviation for glide ratio over ground

Some variables used for glide ratio over ground used 'ld' in
their name. Lift / drag ratio refers specifically to glide ratio in
air, so these names were inaccurate and misleading.
Computer: Rename 'LD' to 'GR' in glide ratio over ground functions

'LD' refers to 'lift/drag ratio' which is specifically glide ratio
in air. If functions are (also) used for glide ratio over ground,
naming them with the 'LD' term is inaccurate and misleading.

The non-specific abbreviation 'GR' (for 'glide ratio') is used
instead.
Developer's Manual: Add section on 'glide ratio' terminology

Recommends usage of 'glide ratio over ground' / 'glide ratio' / GR
to refer to ground-referenced glide ratios and 'lift/drag ratio'
/ 'L/D ratio' / 'LD' to refer to air-referenced glide ratios.
Manual: Specify glide ratio as GR over ground or L/D ratio

'Glide ratio' is a non-specific term which can refer to the ratio
of horizontal to vertical motion with reference to either the airmass
or the ground.
ProfileGlue: include cleanup
OS/FileUtil: add function File::Replace()
IO/FileTransaction: utility class to rewrite files safely
Profile: use FileTransaction to write profiles safely
IO/FileHandle: disallow copying
IO/FileHandle: add move constructor
IO/FileTransaction: simpler MakeTemporaryPath() on Linux

Append ".tmp" to the file name, instead of replacing the existing file
name extension.  This is trivially possible on all POSIX systems.
IO/FileTransaction: add method Abandon()
ManagedFiles: delete unfinished work

This was not supposed to be pushed yet.
LocalPath: add function RelativePath()
Thread/Notify: add method ClearNotification()
Android/DownloadManager: wrapper for android.app.DownloadManager
Dialogs/FileManager: first crude implementation of the file manager

Here, the user can list his data files and download new ones from the
net.  It has a hard-coded list of files, and needs serious work before
this becomes usable.  No progress bar, no error feedback, ...
AirspaceSorter: Moved the units handling out of the AirspaceSorter class
AbstractAirspace: Moved GetVerticalText() into AirspaceFormatter namespace
Fixed main.cpp #include
Finished implementing layers
Packages that use easy_install has to follow a linear build order

This is so that we can avoid concurrent install
Merge remote-tracking branch 'devel/bug-25_fix_numexpr_build'. Fixes #25

* devel/bug-25_fix_numexpr_build:
  Packages that use easy_install has to follow a linear build order
server is okay?

Signed-off-by: Uhehesh <uhehesh@gmail.com>
Merge branch 'master' of github.com:Uhehesh/hehttp
Adding stuff to composer.json
Updating vendors
Select cameras from computer. Add some tests.
Fixes protected areas layer
Fixed footer width & minor style fixes in submission page
Improves performance in projects caching
Added readme, just ripped text from dev documentation, this will probably need to be changed
set ignore_user_abort(true) (Ignore user aborts and allow the script)
xupdate: clean up download dirctory before FTP exec
Updated sample code with the new include path.
Coroutines
Merge branch 'scalaz-seven' of https://github.com/scalaz/scalaz into scalaz-seven
More coroutines
Some docs for Bind, Functor, Monad.
Docs for Monad, Monoid, Semigroup.
Merge branch 'scalaz-seven' of https://github.com/scalaz/scalaz into scalaz-seven
Merge branch 'scalaz-seven' of https://github.com/scalaz/scalaz into scalaz-seven
frame
tests
tests, lenses
fix InsertionMap builder
Fix InsertionMap === to ignore insertion order
tidy zipper
`TypeClass` instance for `Monoid` and `Semigroup`
add `typelevel` to the README
productN for `KTypeClass`
product3 for `TypeClass`
`TypeClass` instance for `Group`
test for group laws
work around an 'illegal cyclic reference' caused by a package object
Collision less harsh
Change var name sensibility to collisionMargin also putting it at top file
Merge pull request #40 from Futa09/gh-pages

Making the collision less harsh review
removed: Tst/Old/lib0.lib, lib0.test: not used any more
fix: Singular/minpoly.{cc|h}

bugfixes and optimizations
on behalf of Sebastian Jambor
version sent in via e-mail on June 6, 2012, 17:00:31 MESZ for master
chg: removed testgh, new utility make_grammar to generate grammar.{cc,h}
fix: memory leak in if (#430) (from master)
Fixed my tab spacing inconsistencies
database changed, gems added, morris.js added, .ignore updated
Wiring up the http module to trigger the init of the web system
Tilføjet tabel + små rettelser
Merge remote-tracking branch 'origin/master'
Lab 5 submission with nothing working!
Changed ns use declaration.
Added nesting tests.
removed tags for comment and commentForm
factored blogPost into a tag
Update fabfile.py

removed apt-get
syntax error
Merge branch 'master' of github.com:adlnet/LRSGame
* added Menu API MenuItems are views on to Commands
* made CommandManager use Command objects
* Brackets now dynamically creates internal menus
* added API for adding removing key bindings
remove file
Merge pull request #946 from adobe/tvoliter/newmenus-impl-squashed

Menu, Commands, and Shortcuts API and implementation (squashed pull request)
Issue 1072. Use getDocumentForPath instead of getOpenDocumentForPath.
Merge pull request #1075 from adobe/jason-sanjose/issue1072

Issue 1072. Use getDocumentForPath instead of getOpenDocumentForPath.
Now scrolls the document to the original position after adjusting the font size up or down.
Changed scrollDelta to scrollDeltaY, and rounded the value out.
Now maintains the horizontal scroll position, as well.
Merge pull request #982 from cantrell/933

Maintain document position after font size adjustment
Remove unnecessary test window from HTMLCodeHints unittests. Fix missing RequireJS config in ExtensionLoader.
Merge pull request #1504 from adobe/jason-sanjose/issue-1494

Fix broken HTMLCodeHints unittests
Use lowercase locales only. Change UI labels to capitalize country codes.
Merge pull request #1458 from adobe/jason-sanjose/issue-1448

Use lowercase locales only in Switch Language dialog
Typo
Typo (2)
Use solid print speed for internal solid layers too. #167
Add checkbox to GUI to enable G-code comments
Some better debug messages and a note about self-intersecting polygons. #160
Removed one more fatal error caused by recent refactoring
Revoking Artistic License
Retract at end of print
Print the number of bogus holes to debug output
Warn if no layers were detected
Poor overlap between perimeters and infill
Loops were not closing well
Fix comments in Perimeter.pm
Some more overlap
Do all shells for a hole before moving onto the next one. #88
Write single wall width (extrusion width) to the G-code file
Bugfix: fill escapes perimeters. #139
Bugfix: fatal error and warnings removed when cleaning some dirty layers
Releasing 0.6.0
Bump version number
Require perl 5.10
Allow portability of config files between Unix and Windows
add response examples to docs
board hard coding text file
Merge branch 'master' of https://github.com/agale123/Catan
fixed redun
parse for sys
Change GetDataChunkServer and Makefile.
utils/installer.sh: fix for replace existing config.
Merge pull request #224 from kaos/patch-1

utils/installer.sh: fix for replace existing config.
Adds glasses-mode to c-common-mode-hook.
Merge remote-tracking branch 'bbatsov/master' into aisbaa/master
Removes glasses-minor mode.
Build fix for new ace worker
Merge branch 'beta' into local
Bump jvm_features for MacOS required jdt bundle
return error if no user is logged in
configure socketUrl in the IDE
fix worker makefile
update ace
update apf
update ace and jsdav references
Implement spinning
Rebuild APF
Merge pull request #1482 from ajaxorg/update-apf

Rebuild APF
remove contents of dead quicksearch plugin
remove unused modules from package
move UIWorkerClient into ace
fix tests
fix typo
three monetdb and r initiation scripts
rename file to make it nice nice
Add DocumentFragment.innerHTML and remove forwarding from HTMLTemplateElement

Review URL: https://chromiumcodereview.appspot.com/10826016
whileFalse: in BlockBehavior; isKindOf:, isMemberOf: inheritsFrom: in Library.st
Adding wrapper dive to article content
Overflow fix
Adding Pinterest header
Hiding redundant body from Twitter posts
Default sizing for input search
Merge branch 'NetUpgrades', remote-tracking branch 'origin'
added images folder and custom cursor
use hasCallback to restrict callback to functions
Bug 798694, part 1: Make it easier to add new pref override files. r=fabrice
Bug 798694, part 2: Move the UA overrides (as they stand now) into gaia. r=fabrice
Bug 810756 - Lower the visual impact during launch Clock APP. r=timdream
Bug 811277 - [Homescreen] Evme - Launching the same app from search should not be loaded again [r=vingtetun]
Bug 810295 - Switch unit button fixed
Bug 811658 - Adress info from FB is showing hometown. r=crdlc
Bug 802583 [Apps] App Install Cancellation Prompt r=etiennesegonzac
Merge pull request #6317 from benfrancis/app-install-cancel

Bug 802583 [Apps] App Install Cancellation Prompt
Bug 810031 - Remove ActiveSync autoconfig mapping for Gmail; r=asuth, a=blocking-basecamp
Merge pull request #6381 from mozsquib/gmail-imap

Bug 810031 - Remove ActiveSync autoconfig mapping for Gmail
Bug 808711 - [email/activesync] Automatically determine a good date range for syncing messages; r=asuth, a=blocking-basecamp
Merge pull request #6412 from mozsquib/email-as-auto-range

Bug 808711 - [email/activesync] Automatically pick a good date range for syncing messages
Merge pull request #6349 from ian-liu/Clock_lowering_the_visual_impact

Bug 810756 - Lower the visual impact during launch Clock APP. r=timdream
Bug 807308 - Fix a typo and cancel the timeout put in bug 808227 when transition cancels
Bug 810738 - Part II; add a slowTransition toggle to test transitions and state change
Bug 810722 - [Cards View] window animation flashes when zooming out
Merge pull request #6416 from steveck-chung/bug-810722

Bug 810722 - [Cards View] window animation flashes when zooming out, r=timdream, a=blocking-basecamp
bug 810825 fix SIM card unlock white screen problem
as well as follow-up bug 806237: add SIM card state on main menu
Bug 799723, 799715 - [email] Automatically linkify URLs and e-mail addresses in plaintext and HTML e-mails. r=asuth, a=blocking-basecamp
Merge pull request #6419 from asutherland/email-click-links

Bug 799723, 799715 - [email] Automatically linkify URLs and e-mail addresses in plaintext and HTML e-mails. r=asuth, a=blocking-basecamp
Rectified rampant 'roule'.
Merge pull request #493 from kuyanatan/patch-1

Rectified rampant 'roule'.
Use 'venv' consistently for virtualenv directory.

Pointed out by tri on #pocoo.
Fix typo pointed out by tri on #pocoo.
Reword 0.9 upgrade doc, thanks to plaes on #pocoo.
Use American English for "behavior" in docs.

Prompted by plaes on #pocoo, mitsuhiko confirmed to use American English.
Add detailed Apache httpd fastcgi configuration.
Touch up fastcgi doc.
Merge branch 'master' of git://github.com/mitsuhiko/flask
Deleted link to ep.io
reformatting
renaming for better understanding
update 2012-10-30
when it fails
ALLJOYN-1350 Add Alarms to a work queue as they arrive, to keep them in arrival order.
MBUS-1330: Added support for new build global ANDROID_API_LEVEL_NDK and optional ANDROID_SDK variable

Change-Id: Ib0819391e376ba1e13b83236f8fd923f6520820a
Allow existing url parameters for question_text and answer_text urls
FIx problem with tmux+ghci
support connecting to rpyc through unix domain sockets
add manifest file
fix build for clang
Potentially final devise commit
Added support for Ruby1.9
Fixed tests
p-Vals: Printing 12 decimal places instead of 4.
Merge branch 'development'
handle empty ajax body
fixing merge conflict
Added LSCOLORS for BSD
Merge branch 'master' of github.com:amcoder/config
Change backup, undo directories.
Add design tweaks from Stephen Hay. Fix focus after previewing whole artifact.
Improve error messages for subprocess filters, idiopidae filter.
Exposed stations writer to allow stubbing for tests
wiki: Remove c.show_wiki_actions
Missing template!
Paulinho - 25/10/2012
Fixed ViewDispatcher tests
Merge branch 'master' into route_by_identifier
using the base url config for auth callback
Implemented matrix transforms for 3D vectors
Playing around a bit more with computing longitude on the ecliptic; still no joy
Added 4 sets of latency measurements along with READMEs
Update Picasso submodule
expr 001 and 002
fix ugly method name

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1424188 13f79535-47bb-0310-9956-ffa450edef68
Fix for loading replicated tables with @LoadMultipartitionTable
Simple check to ignore null input dependency ids
Fixed long standing bug with make-workloads script
Fixed SpecExecScheduler calls to TableConflictChecker
Fix on usable colors
Try to unfreeze underscore
Updated hash formats
Fixed test regressions introduced at APSTUD-4894
Merge branch 'development' of github.com:aptana/studio3 into development
Implement APSTUD-4451 Align validator and marker names for HTML/JS/CSS
Implemented mango.is_true method to evalueate Truthiness in a Pythonic way.

In Javascript, empty lists evaluate to "true": [] == true
In Python, empty lists evaluate to "False":  [] == False

In Javascript, empty dicts evaluate to "true": {} == true
In Python, empty dicts evaluate to "False": {} == False

In Javascript, True is undefined.  We get around this by declaring local
variables for True and False in the rendering function.  This was added
outside of the scope of this commit.

Signed-off-by: David Arbuckle <dintlu@gmail.com>
String arguments passed to tags can now contain spaces.

Cribbed the regex directly from django.utils.text

Signed-off-by: David Arbuckle <dintlu@gmail.com>
Clear function implemented.
Tidied up code to use double-quotes
Destroy connection when 'end' event occurs to prevent EPIPE errors.
Fix segfaulting in playlist container callback routines.
Fix iterator reset and add reset ranges

The `git_iterator_reset` command has not been working in all cases
particularly when there is a start and end range.  This fixes it
and adds tests for it, and also extends it with the ability to
update the start/end range strings when an iterator is reset.
wip: more checkout updates
Add failing test to demonstrate wrong checkout behaviour
More checkout improvements

This flips checkout back to be driven off a the changes between
the baseline and the target trees.  This reinstates the complex
code for tracking the contents of the working directory, but
overall, I think the resulting logic is easier to follow.

At this point, there are still some failing tests, some missing
tests that should be cherry picked, a needed rebase against the
development branch, and a needed rebase -i to squash some of the
intermediate commits that are just works in progress.  I'm really
just pushing this to GitHub since it is a decent snapshot of
where things are...
usunieto problem z nodami oznaczonymi dwoma cyframi
add config page
add setting.del_setting and fix settin.set_setting updates not working
add css rule for all form cancel buttons
add config page to navigation, move `other league`
add back button js handler
add support for custom host/port when debugging
enable cookie support for ip hosts
add better ios support
Make new parameters
Use new keys
Updated params
Merge pull request #1 from abhisheksunkuru/master

Updated Params
Corrected paths to include leading slash.
Restored DeviceManager events to manager.start, moved intAirAct to start after DeviceManager
Added debug statement to catch intermittent error in DeviceManager.
Removed TODOs, tidied up comments after verifying networking works.
Sensors: display only temperature stats
[Core] changed: pass additional arguments to AsyncFileCreate
attempt on Nix expression for xbmc

configure fails while trying to lookup the sonames of some libraries.
linux-3.5: Enable XEN_DOM0 support
F-Prot: package
fix mpich2 and mplayer
Revert "ffmpeg: Add optional Jack audio support."

This reverts commit fe42f8add91b1616de94f878351f3dd5b44dbcdd.
Revert "ffmpeg: Add alsaLib to dependencies."

This reverts commit d9f08cf6f26337efd5a3a4142c38a0963aba31c4.
Revert "ffmpeg: Add option to enable x11grab support."

This reverts commit 05831d3a668361b2948c0185eceb6d7c579c851a.
Revert "ffmpeg: Update to latest version 0.11.1."

This reverts commit c6a2a1f8851bc3896a824219dfc5545a642fba45.
Revert "Update RPM to 4.10.0."

Commit e29c284926c2ba3b239c4ee3aaa21aa9396f046a breaks some builds, i.e.
<http://hydra.nixos.org/build/2890636>.
dovecot2: Bump to 2.1.8
kbd: Hard-code the path to gzip/bzip2

This is necessary for systemd-vconsole-setup.service in systemd.
kbd: Update to 1.15.3
grub: Update to 2.00
upower: Update to 0.9.17
more progress on XBMC build
removed unofficial autoconf-2.67 from xbmc branch
haskell-HsOpenSSL: update to version 0.10.3.2
haskell-comonad-transformers: update to version 3.0
haskell-comonad: update to version 3.0.0.1
haskell-data-lens: update to version 2.10.1
Fixed properties.
Fixed MessageReplayer to properly send enclosed messages.
Merge branch 'messaging' into stage
Changed the permitted full fetch periods for tv and radio.
More descriptive comment to make it clear why there is a difference in window between tv and radio.
wrap locked code in try finally
Merge branch 'mbst-3937-pa-biogs' into stage