labofsahil/github-event-dataset-2012 huggingface dataset:
Add support for upgrading NDBX files.

NodeLibrary can register static functions that upgrade from an older to
a newer version. The function specifies just the transformation on each
node, and all looping and recursion is handled by the NodeLibrary.

Subsequent updates (1->2->3) are also handled correctly.

The GUI currently does not try to upgrade files automatically yet.
Older files just throw an OutdatedLibraryException.
Merge branch 'file-upgrades'
Pack node checks if shapes are connected first.
Upgrade builtin libraries to version 2.
Old files are automatically upgraded.
1. Fixing nested problem

2. Updating the hibernate ver to 4.1.4
Added composer.json
Grid: Added ability to use grid without extending
Update src/web/tradehistory.php
updated note file to match md convention.
removed outdated file.
updated notes.
TE files and examples for web and testing team

These assume that /te/service/ is the location of the web services on
the server. Changes will need to be made to WSRequestManager.class.php
and login.include.php to get this to run on dev machines (because they
include hard-coded locations until we can pull from ENV vars).
Merge branch 'master' of https://github.com/nordquip/sousms
Remome the makefiles.
Mentions.
couple more functionalities
That's it. I'm done with this. Now going to blog about it.
Re-introduce old deprecated Session methods
Add missing implicit
Bump Scalaz 7.0.0-M6
merge with @slandelle last changes
Update notes for submitted changes

* Finish off functions mips32_pracc_read_mem16() and mips32_pracc_read_mem8()
transport: remove interface multiple transport warning

Currently if we have multiple transport's defined we receive an warning similar to:
must select a transport.
allow transport 'jtag'
allow transport 'swd

This removes that warning and only prints this info if transport_init fails.

Change-Id: I87126390f234bc2f705e1f150a0dcc110dcab151
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/532
Tested-by: jenkins
Update notes for submitted changes

* stlink: improve swd hardware reset
The Web - Concise and Simple
a tuning that makes the game of life 1.98 times faster!
NXIDE-240 Removing duplicates classpath entries when adding the Nuxeo nature
NXP-10435: allow widget to be null + fix controls retrieval on subwidgets
NXP-8075: rename new 'date_range' widget type to 'datetimeRange'
Removed predefined font attribute
Added new features
Updated CSS to work with Android
Added new about message

Added copyright footer
Updated preview image
customize copy mode
updated plugins/bf3/bf3.cpp for DLC Armored Kill(build 981420)
Merge pull request #113 from bogie/bf3_ak

updated plugins/bf3/bf3.cpp for DLC Armored Kill(build 981420)
Benchmark: Fix crypt resync handling
accidentally switched top and front vector, has been fixed and tested with two people.
Merge pull request #114 from bogie/bf3_ak

Fixed a switched vector
OverlayConfig: Hide uninstall button on Windows
Portuguese Brazilian update
compiler.pri: Update OS X Boost to 1.51.0.
osxdist.py: consistent .dmg naming for releases and snapshots.
Mumble: include and export all Qt symbols to plugins (static OS X)
Murmur: fix static OS X build.
osxdist.py: move to a separate Murmur package on OS X.
osxdist.py: only rmtree if path exists.
Introduce channel nesting limit (default=10).

Add NestingLimitException to Ice Interface and introduce a new NestingLimit PermissionDenied type.
Addresses #3566322 "ServerDB::deleteServer crashes master"
Add more newbie friendly READMEs to the static servers.
osxdist.py: use new README for static server; tweak filename.
Translation updates; fix shortcuts for right click on a channel
initialize member variable DevState::initRefCount in constructor
Fix debug output for overlay chain notice

The debug outputs were placed after the return statements, rendering them useless.
Place them in front, so they are executed.
Added possibility to whisper to sub channels of parent channel(#1-#8)
stats update
Merge branch 'master' of github.com:odalisk/odalisk
Amélioration d'extraction des catégories, stockage de la valeur brute

Signed-off-by: Maxime Bury <maxime.bury@gmail.com>
Merge branch 'master' of github.com:odalisk/odalisk
more robustness against spaces in discussion id lists
Filtering discussions (such as test stories)
Making DiscussionVisualizationPanel zoomable - using same approach as in
NetworkPanel
down answer
do not use custom gtk or awesome themes
awesome: bind calculator key to... run calculator!
вид ссылки "перейти в каталог"
Signed-off-by: Roman <oksamitnyj@gmail.com>


Signed-off-by: Roman <oksamitnyj@gmail.com>
Merge branch 'master' of github.com:oksamitnyj/kids
Implemented: Moderation
Webmaster can manage ContentPages
fix mocked data to return correct total
1.0.23
Merge remote-tracking branch 'upstream/master'
Unsuccessful build
Failed unit tests
Successful build and tests
Windows: afscreds import lsa before renew expiring

Reviewed-on: http://gerrit.openafs.org/7649
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 712c0c1d0e506a9010d7a5cc93dfd49bee006d41)

Change-Id: I1b4a6add63d52e870c25633695365395934cdbcc
Reviewed-on: http://gerrit.openafs.org/7709
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: afslogon expand short domain names

Depending on how the user specifies the domain name during login,
NPLogonNotify may be given a short or a full domain or kerberos
realm name.  If the name is the short name, attempt to expand it
automatically if there is no 'realm' configured for the short
domain name.

This patchset relies upon data in the local registry instead of
using an API such as NameTranslate in order to avoid network
queries to the domain controller that might not be reachable.

Reviewed-on: http://gerrit.openafs.org/7650
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 17584782a4d76facf5a89a3eeeebfcc23582b3e8)

Change-Id: I50c66298e4543932c02d5dce2f1d524d0bcf157f
Reviewed-on: http://gerrit.openafs.org/7710
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Revert "Add some basic tests to check out fuse"

This reverts commit 94bf003a720c9a883ba7ebf43ab3053d3072d3dd.

The fuse tests are fundamentally broken as they stand:

*) They rely on files that have not been committed to the tree. To
   function correctly the file fuse/conf/CellServDB must be present
*) They always run, regardless of whether the fuse helper binaries are
   installed on the developers system, or even on whether the tree was
   built with fuse support enabled.
*) They pass, even if fuse fails to start up
*) The file fuse.sh is committed, despite being unused. This is
   particularly confusing, as it looks like this is where the tests
   are performed from (its not, testing is done in dynroot-t)
*) fuse-log should be either cleaned up, or flagged as ignored in
   .gitignore

Revert the commit until such time as all these issues can be fixed

Change-Id: I5ff9a95f33c0a5d0614bb47c521a8770d92fe2eb
Reviewed-on: http://gerrit.openafs.org/8230
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Import of code from heimdal

This commit updates the code imported from heimdal to
3fe55728404c602884f16126e9cc60fc5a3d8f20 (switch-from-svn-to-git-2993-g3fe5572)

Upstream changes are:

Andrew Bartlett (1):
      Revert "make paranoia check less paranoid" - check that key types strictly match

Jeffrey Altman (3):
      do not include stdint.h unprotected
      Windows EAFNOSUPPORT defined by VS2010
      roken: Use a common allocator for all windows

Love Hornquist Astrand (2):
      add rk_getpwnam_r
      move windows compat errno constants to after <errno.h> is included

Nicolas Williams (7):
      Fixes to make Heimdal -Wall -Werror clean
      Make krb5_kuserok() pluggable and add features (including MIT config compat)
      Generalize token expansion to allow for context-specific tokens
      Address code review comments (use krb5_enomem())
      Make master build on Windows
      Fix a compiler warning in lib/roken/snprintf.c on 32-bit Ubuntu
      Move base into lib

Roland C. Dowdeswell (3):
      Turn on -Wextra -Wno-sign-compare -Wno-unused-paramter and fix issues.
      Provide support for enctype aliases for ease of use.
      Additional changes to make -Wshadow build on Ubuntu 10.04.

Simon Wilkinson (1):
      hcrypto: Use correct size for memset in md2

New files are:
	roken/realloc.c
	roken/win32_alloc.c

Reviewed-on: http://gerrit.openafs.org/7612
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 9c0b7be87de83493ca1d5a01326982ce5c8c131b)

Change-Id: Ic2d0405e9fa67818e3de5e26beafe96a6fcec34e
Reviewed-on: http://gerrit.openafs.org/7668
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: export roken allocators

Use rk_alloc, rk_calloc, rk_free, rk_realloc instead of Windows
C RTL allocators.  The OpenAFS source tree has a bad habit of
allocating memory in one module and freeing it in another.  This
is not a problem for POSIX but is disaster on Windows.  This change
ensures that all OpenAFS modules share the same allocator.

Reviewed-on: http://gerrit.openafs.org/7625
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit 5e91c3b5d1a70f7af2e04ac74d98ae6b407f169c)

Change-Id: I8d0e2d3c6ecf700ebbee6d90826c1d27ca458732
Reviewed-on: http://gerrit.openafs.org/7669
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: PrimaryVolumeWorkerThread Garbage Collect Fcb

Revert commit cecd99abd3837ef820d78fb15e450c8688b0f39b.  Failing
to garbage collect the FCB from the ObjectInformationCB at the
earliest opportunity opens the door to a deadlock with Trend Micro's
anti-virus driver.  Trend Micro attempts to make a copy of the
file data each time a CcPurgeCacheSection() is performed on the
FCB.  If during AFSValidateEntry or AFSVerifyEntry a DirectoryCB->
ObjectInformationCB->FCB is discovered which has a non-NULL
SectionObjectPointers.DataSectionObject and the data version in
the DirEnumEntryCB differs from the ObjectInformationCB, a
CcPurgeCacheSection() call is performed while holding the
FCB->NPFcb->Resource exclusively.  Trend Micro will deadlock the
thread making the CcPurgeCacheSection() call when it attempts
to open the file in one of its worker threads.

Reviewed-on: http://gerrit.openafs.org/8529
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit a428033bfe78c00dad84af9c14645723344297cf)

Change-Id: I41364742c723ed40513f2fe42952b9758545adae
Reviewed-on: http://gerrit.openafs.org/8586
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Some work on our Simulation collapsible widget (#112). Also some minor cleaning up.
Some more refactoring (#57).
Some cleaning up (#57).
Moderator can now send, receive bot private messages.
Provide callback pair for when a session becomes active (first client
enters a session) and inactive (last client leaves).
Fixed typo and added sponsor acknowledgment.
Added practices and dates of death
fix issue with serializing on save map
reflect owslib changes
Handle special characters - []{}() - in shapefiles during upload
Added Tom Kalidis to AUTHORS
Fixed permissions for data layers
Fixed port on dev GeoServer proxy
Merge pull request #323 from Applied-GeoSolutions/fix_gsport

Fixed port on dev GeoServer proxy
Merge pull request #324 from Applied-GeoSolutions/fix_layerperm

Fixed permissions for data layers
Merge pull request #312 from menegon/owslib

reflect owslib changes
Merge branch 'master' of github.com:GeoNode/geonode into dev
Merge branch 'dev' of github.com:GeoNode/geonode into dev
s/DEFAULT_CSW_ALIAS/DEFAULT_CATALOGUE_ALIAS/, update tests README
back out CSW tests ref until they are complete
Merge pull request #325 from tomkralidis/dev

update tests README and CSW ref
Merge pull request #317 from cga-harvard/specialchar_upload

Handle special characters - []{}() - in shapefiles during upload
Merge branch 'master' of github.com:GeoNode/geonode into dev
Merge branch 'dev' of github.com:GeoNode/geonode into dev
Fixed query removal bug in make_pre_authed_request

This fixes LP#1008708

Change-Id: I1b8238fb2ffe07b1474f7d8f040fdc620b6897d7
pep8 db.py

Change-Id: I2ae277b6f435f56549560684697486b56d24d46d
Merge "pep8 db.py"
Update notes for submitted changes

* Do not use pickle for serialization in memcache, but JSON
removed erroneous bundler line
Few modifications, such as mapping capslock to esc and disabling
easytags, can't seem to get that working correctly.
Merge branch 'testing' into testing-ninja
plugins tests  fixed
added market to test plugins
Merge branch 'testing-ninja' into testing
string fixes in tools
fixes old styles from previous version
use admin email in each email that is not send to the admin #427
Merge branch 'issue-427' into develop
some improvements on login / logout process
more improvements, because order matters ;)
Merge branch 'login' into hotfixes
Merge branch 'hotfixes' into develop
A redo of the deps and built-with.
[tx] minimum_perc = 70
added management for Google latitude
For some reason creating new post adds 5 hours.. not paying attention to time zone even though I'm setting it .. *boggle*
Font is verdana, and adding markdown converter
Leveraging the power of markdown here.. Posts no longer have titles, rather those are set int he content and as such you can have 100% control over how your post displays.. awesome sauce..
Adding validators around posts and seo
Removing title from posts
Getting page show to work correctly
entered the text of the edition P.Vet. Aelii 9

 - Created from SoSOL template
 - entered the text of the edition P.Vet. Aelii 9

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2012;0300' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0300.xml) to 'papyri.info/ddbdp/p.vet.aelii;;9' (DDB_EpiDoc_XML/p.vet.aelii/p.vet.aelii.9.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/p.vet.aelii;;9'
corrected according to Sosin and Cowey
Update revisionDesc

 - Vote - AcceptText - Accept. Note that all the gaps in brackets should be ca.; Lin1--> Αἰγύπτου]; lin5--> περ̣ὶ [.3]ε̣2θ̣αυορ.1; lin7--> δεκαπρ̣ώ̣του̣ τ̣[; lin12--> 12.- των; lin16--> 16.- ; lin17--> [.3]ca.3; lin29--> [ca.2]; lin34-->[.?] <:[ἀ]πουσίας|alt|[ἀ]π’ ουσίας:>; lin53 .3(?) --> ca.3; lin69--> κατὰ (Joshua D. Sosin)
 - Vote - AcceptText - lin7 .1[ca.20] is correct (checked on photo) and see Sosin's comments. (James Cowey)
 - Finalized - Ready. (James Cowey)
Entered Greek text from CPR 19.25. lin3--> skipped underdotting (νον)

 - Created from SoSOL template
 - Entered Greek text from CPR 19.25. lin3--> skipped underdotting (νον)

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2011;2428' (DDB_EpiDoc_XML/sosol/sosol.2011/sosol.2011.2428.xml) to 'papyri.info/ddbdp/cpr;19;25' (DDB_EpiDoc_XML/cpr/cpr.19/cpr.19.25.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/cpr;19;25'
corrected according to Cowey and Berkes
Update revisionDesc

 - Vote - AcceptText - Not sure that we really want to include suggestion for the proper name at the end of lin2 (and middle of lin3), I would be inclined just to have (|παλλ|); lin4 (δ(ι))' -> (δ(ι’)) use correct apostrophe and (δ(ι ))' -> (δ(ι’)) without the space before double ); second lin4 /*vac <18,5 cm>*/ -> vac.?. Good that the month names have capitals and are accented. lin3 ([μό](νον)) -> ([μό](νον(?))) (James Cowey)
 - Vote - AcceptText - l.2: ((ἥμισυ)) ---> use the symbol for 1/2.; 
l.4: ((ἥμισυ)) ---> use the symbol for 1/2.

I agree with James on (|παλλ|) (Lajos Berkes)
 - Finalized - Ready. (James Cowey)
Finalization merge of branch 'DDbDP_Editorial_Board/finalizing/2012/07/28/CPR_19,_25' into canonical master
Fixed comment lookup derp
I like money
Merge branch 'refs/heads/master' into development
Undid my dumb version crap
Removed a stray .DS_Store file
Pruning fonts/ dir, since LaTeX theme is gone.
New posts, tweaks
Add new post, resume.
Change dev.ost.io -> ost.io.
Use Menlo as main monospace font.
Adding in newdetect
changed own snippets fork to honzas
[Paizo] Pathfinder RPG: Ultimate Combat
- PrettyLst run
Issue#: NEWSOURCE-130


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@17468 b6a209e6-650d-0410-972b-dadffa731f64
Fix: Batch Converter Crashes on PCClass File line with only tab(s)
Issue#: CODE-1920


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18672 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Work stuff.
Merge branch 'master' of github.com:pdixon/dotfiles
增加个人信息和简历页面
修改按钮图片,规范文件名
Yesod
fixed
fixed stuff
JavaScript privacy options
fixed some tests + some interface checks
Revert "' -> ’"

This reverts commit 0ed0218d193a97711cf92e4853842a30ff842c81.
more verbose debug logging on mismatching dependencies
Removed unused ObjectMapper.
MDL-31824 - Calendar - Fixing HTML classes fopr calendar month view
Updating 0.5.0beta DLLs
Related #921 - Rewrite real_ip function to handle CSV and optionally exclude reserved addresses
Added the start of the functional spec.
user can now add employee schedule
started work on implementing whois. weird commas have started showing up in places...
cleanup. delegating display to chatterbox. I think I have done as much as I can do without screwing up the merging process later. That said, fixing conflicts is pretty easy, usually. the trouble is the templates file is massively different, and working out how to merge the styles properly may be very tricky.
half way there, kinda. most other changes will be aesthetic and stuff relying on code not implemented in dev yet. oops. going to be fun merging everything.
merging in whois branch. fixed conflicts.
got things working properly. further testing may be required.
works. preparing dAmn extension for storage.
merging in the storage object
Dustin Whittleさん追加
make module name configurable
constant added for version service in ServiceConstants.java
Windows Archetype changes
Windows Archetype changes
Merge branch 'durban' of https://github.com/phresco/phresco into durban
plugin javascript and js test runner added in pom.xml
[artf531337] CST Defect - Code validation Failure issue fixed
artf524206: Sonar PDF Generation for all technologies
 artf524206: Sonar PDF Generation for all technologies
Merge branch 'cairo' of https://github.com/phresco/phresco into cairo
 artf524206: Sonar PDF Generation for all technologies
version number changes and removed unnecessary folder
Merge branch 'durban' of https://github.com/phresco/phresco into durban
issue fixed in update customer
PERF: prefer to use CPU over GPU

Turns out that CPU OpenCL is more widely supported and seems
to have comparable performance and more stable behavior than
the GPU versions (this should be investigated more closely).
ENH: more robust installation script
ENH: add ability to toggle bot and BUG: avoid out-of-bounds error
Merge pull request #16 from lightninggk/master

Limit reached when maxItem=1

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1454 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
removed all "toJSON" stuff from prototype-light, so that native JSON works

git-svn-id: http://www.pimcore.org/svn/pimcore/private/core/trunk@1862 1f8fe7d8-47f0-464c-8d0a-336f4953ab05
pass in schedule to schedule_list and show section name on section list
Load selected single URI into the current tab correctly (fix #29)
add sox to app/Contents/SharedSupport dir, separate makefile step for Command
Added some fixed-width programming fonts
Added text to README file
Added text to README file
Changed CGUIViewStateVideoTVShows constructor

Replace current sort methods with the same ones used in
CGUIViewStateVideoMovies class. Used by smart playlists for sorting
operations.

Changed the constructor

Fixed constants in constructor.

As suggested, fixed the constants used in AddSortMethod(). Bad
copy-paste from the movies class constructor. It's strange that it
worked even like that (tried for example to sort by date).
Merge pull request #1158 from orewagundam/master

Fixed sorting for tvshows smart playlists.
Merge remote-tracking branch 'xbmc/master'
FIX: JSON-RPC: Setting the playcount does not produce expected announcement
Merge pull request #1172 from koying/json-fix

FIX: JSON-RPC: Setting the playcount does not produce expected announcement
[AE/CA/IOS] - fixed initialisation order in c'tor
[AE/CA] - fix possible assert which is non fatal
[darwin] name threads so they are visible in debugger
pvr/epg: don't update the selected file when updating data because of a notification from an observable in pvr windows. fixes 'jumpy' window when the epg is being updated and you navigate through the timeline while a pvr stream is playing. removed virtual keywords where it's not needed in pvr windows (should have been two commits, but I'm lazy)
pvr: added selection of channel groups within channel osd. closes #566
pvr: updated Spanish translation. closes #568
pvr: updated German translation. closes #574
pvr: fixed - mark as watched: store play count as int instead of bool. closes #576
Fix for thumbs not auto-generating for some iPhone MOVs.
Merge remote-tracking branch 'pvr/master'

Conflicts:
	xbmc/addons/include/xbmc_pvr_types.h
	xbmc/pvr/recordings/PVRRecording.h
Merge remote-tracking branch 'xbmc/master'
CPUInfo.cpp cosmetic and cleanup
Prevent using uninitialized variables on Win32
Return lastUsedPercentage instead of 0 when current percentage is unknown
Update lastReadTime only when CPU usage reading was really successful
updated hands-on 13
readme test
Initial setup with guard, rspec, factory_girl, capy, poltergeist.
Adding schema.rb to repo
Very basic Java driver. Shows how to interact with CakeDB, although I strongly suspect a real Java developer could do a much better job…
fix lo3 with timers
Fix PHP notice when invoking autocomplete command without argument
Update Fri Dec 14 06:00:21 CET 2012
Update Sun Dec 16 09:00:22 CET 2012
PostGIS 2.1 changes section was incorrectly listing 2.0 instead of 2.1 changes.  Also just folder 2.1 changes into many What is new in 2.1 section.

git-svn-id: http://svn.osgeo.org/postgis/trunk@10286 b70326c6-7e19-0410-871a-916f4a2858ee
#1897 relabel currently mislabeled postgis_upgrade_20_minor.sql to postgis_upgrade_20_21.sql  (still need to do the same for raster and topology)

git-svn-id: http://svn.osgeo.org/postgis/trunk@10201 b70326c6-7e19-0410-871a-916f4a2858ee
Added .tmux.conf
Update aliases
#626 - add ability to get result as array, and to control application of periodic charges
refactoring: headerfs, move /info to new directory /header/info
apichange: better open() prototype
refactoring: code simplification in regular files handling
feature: headerfs driver + write permission on some pseudo files

NOTE: should be refactored later (need a dedicated file handle driver)
Fixed caching issue and added tag filtering.

Caching was unable to write properly, possibly only a issue when using
ruby 1.9.2.

EAAL breaks when making a corporationsheet request that has a
description with elements within. I've added a regex to filter tags
before becoming a new ResultElement.

Two small fixes.
Merge pull request #5 from cmfoster/master

Caching & Sanitizing inner element text
Changing readme file to markdown syntax
Merge branch '2.0' of https://github.com/ppi/skeletonapp into 2.0
Update libQGLViewer to 2.3.17 and Fix PyQGLViewer formula on Lion
fixed tips pml;
bench/readme fix
Create configtest.py
Handle HTTP errors from URL shortener (stupidly)
Log in solved
Merge branch 'master' of github.com:proj102/qrcodes
Set missing global-hl-line-mode.
adding outline back for now, so that talk owners can see their outlines.
I'll com back to this.
Fixed search module weirdness.
Add barrier and double barrier recipe along with docs and tests.
Assignment 1 - 4
fix bug when using conditional var in sync queue
Hide the compare divs in the background because they can become visible on resize.
Hide demo browser button as first one.
Table destructuring pattern
Added missing deprecation note to changelog.
release_post_process: Moving config files from 1.1.4-rsmart to 1.1.5-rsmart-SNAPSHOT
Correcting same code for different errors
CatalogManager changes
doc: RDoc -> YARD in the document of Expression#inspect

refs #1493

Before:
  call-seq:
    ...

  ...

After:
  ...

  @overload ...
    @return ...
doc: replace RDoc tag with YARD one in the document for Context#support_lzo?

refs #1493

Before (RDoc):
  call-seq:
    ...
  ...

After (YARD):
  ...
  @overload ...
doc: replace RDoc tag with YARD one in the document for Context#support_zlib?

refs #1493

Before (RDoc):
  call-seq:
    ...
  ...

After (YARD):
  ...
  @overload ...
apt-get update in extras/ci/setup.sh
Honor open= options for sections
next is 1.4.0
update helper scripts
Fix AS7-4749: mod cluster ssl config did not work
Final translations for 1.3.x
Fix JBPAPP-8735
Fix JBPAPP-8992: Unable to write attributes initial-write-timeout and refresh-timeout of JMS domain discovery group
Fix JBPAPP-9091: resource adapter connection definition properties
Fix JBPAPP-9091: second part
Fix JBPAPP-9105: resource adapter security settings
updated gitignore
Fix JBPAPP-9055: No property 'failover initial' exists for jms bridges
typo in message bundle
Prepare 1.3.2.Final
Provide the ability to filter the environment properties
Derive preferred language from "-Duser.language" and act accordingly if it changes.
rollback the -Duser.lang switch, it breaks the domain mode
the example extension moved to it's own repository
separate localTabName and  tabName on @FormItem
Gracefully handle https://issues.jboss.org/browse/AS7-5157
Fix AS7-5238
treeview
tree_grid creation
tree_grid test
update
update
Paging expands the session request limit
added gradient box
added other C++ distance detection functions
v2 converter
Generalized hardcoded relax version from 0.0.7.1 to '~> 0.0.7'
ResourceCatalog: make some properties virtual
ParserTests: test PoParser, update for changed strings
Strings: de-gender for en_US
GeneratorTests: test PO generator
ParserResourceCatalog: a ResourceCatalog that is constructed from a Parser
CatalogTests: test the Catalog API
Catalog: add POT/PO test data
started chengeScene creation. head sensor stopped working anymore
Removed PHP 5.3.4 from Travis tests

5.3.4 is not available on Travis to test against
Improve debug.log output.

Also, rename AlreadyAskedFor to AlreadyWaitingFor (makes more sense, as can cease waiting, but cannot stop having done a past thing.)

Only display peer if fLogPeers is set, for privacy purposes.

Conflicts:

	src/main.cpp
Updated the `Manager` to use a host class over it's configured name

This makes sure that when a host is specified when using the manager (using
environment variables for example) that it tries to find a host by it's class
before using the configured name. This is to ensure that if a user specifies a
host class when running the rake tasks, that they always get that class.

Closes #8
dataField
Custom IP address parsing functions

Before, we were using the inet_pton(3) function to parse IP addresses in the
cork_ip_init family of functions.  Unfortunately, different platforms have
different rules about which IP address strings are valid.  To eliminate this
inconsistency, we now use our own custom functions to parse IP addresses.

In addition, the test-core test case now contains many more expected-good and
expected-bad test cases (including all of the IPv6 address recommendations in
RFC 5952).  In addition, the test addresses are now defined in a single place in
the test-core.c file, with the IPv4, IPv6, and generic IP test cases deciding
whether each should be a successful or failed parse.
Billing Date Literal
display slug for convenience when lookup of walk in url
Scheme admins changed to accomodate new grade SalesManager
Revise for some tolerance, if an actualCobroker is specified, batchApproval is still possible
Added MediaWikiArticleSet generator class and MediaWiki.list()
Update MediaWikiArticleSet and MediaWiki.list() to actually work
Unfortunately this is super slow and way unscalable, and will need additional work to do anything useful at Wikia
update gitignore
Finish writing generator component and subsequent example for Wikia
Merge branch 'MWArticleSet'
Version bump to 0.2.0
Fix composer.json
Fix create-namespace bin, fixed locking issues in linux
Fix create-namespace bin, fixed locking issues in linux for real
Version bump to 0.2.2
Merge pull request #6 from vierbergenlars/master

Fix linux issues with create-namespaces
Reverting parameter name change made by mistake
Add extra packages definitions.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Warn when an installed package is not in local list.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Start httpd afer blog is published.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
Fixed sitemap displaying entries for urls that point to external sites
Filter urls that use https
Added Eduardo Rivas to AUTHORS.
Merge
Added mezzanine-polls to third party apps.
Update mezzanine/accounts/__init__.py

Display more informative error if this exception is thrown.

This exception handler can hide informative errors about model unrelated model declaration. 
Update mezzanine/accounts/__init__.py

Even better checks for the profile model string.
Merge
Fix unfiltered RSS feeds for Django 1.3
Use tag slugs for tag RSS feeds.
Fix unicode handling for slugs in Django 1.5
Fix urls in mobile search include for Django 1.5
Fix mobile tests for Django 1.5
Handle invalid images in thumbnail tag. Closes #410.
Use Page URLs without trailing slash when settings.APPEND_SLASH is False
Full support for APPEND_SLASH is False.
Added Kenneth Falck to AUTHORS
Merge branch 'master' of git://github.com/stephenmcd/mezzanine

Conflicts:
	mezzanine/core/templatetags/mezzanine_tags.py
README.md: removed special message
a dodgy db schema. Let's just say I need to re-read my database 101 textbook.
Merge pull request #625 from rhelmer/stage

bugfix for SQL scripts
Revert "Add timeout in socorrorc for cronjobs"

This reverts commit 296ecfb45f2b02bb5ef9380aa88b87510ad6ac2e.
tools/setup.sh: parameterize project name and associated user

Instead of hardcoding the project name and its associated user, use
variables since the Debian package uses tuleap/www-data everywhere while
the RPM still uses codendi/codendiadm in numerous places.
tools/setup.sh: do not hardcode the database name and database user

Instead let setup.sh define them during initial installation.
tools/setup.sh: factorize 'rpm -q' checks in a distro-agnostic function
tools/setup.sh: cleanup the code to input passwords

Factorize the logic in the input_password function and fix indentation at
the same time.
tools/setup.sh: check availability of rpm, service and chkconfig on RHEL only

Also drop variables for unused commands and add some missing variables
to the availability check.
tools/setup.sh: only verify RHEL/CentOS release for RHEL installation profile
tools/setup.sh: use distro-specific variable for Tuleap cache directory
tools/setup.sh: do not fiddle with $PROJECT_ADMIN account on Debian

Since $PROJECT_ADMIN is www-data which is pre-existing and is a system
account.
tools/setup.sh: regroup related code in new functions for more readability

Also introduce install_dist_conf() to install our own configuration files.
tools/setup.sh: generalize code to manage services

We now use distro-agnostic functions to enable and start services.
change colors of architecture diagrams
i done add a slide
Changed default channel joined and added regroup plugin

Changed the default channel to be #all; all bots will join this channel
on startup. In addition, I added my prototype for a plugin that allows
bots to regroup themselves into new channels based on certain
parameters.
Add textobj-rubyblock.
carry less in your pockets, dude
put more of the coin of mero into coffers
stash some rocky cp; used some torches
Update bundle (supertab)
arena seems to be working, has to be refined
Merge branch 'master' of github.com:rlepigre/tin171
uses exponential distance
added lots of cool stuff D:
learn do goals
Fix for sage #13678, allow tab completion of matrix constructor.
Updating the changelog for 0.1.5
This is a fix for bug # 853 --
see:  https://bugzilla.xamarin.com/show_bug.cgi?id=853

What was happening was ColumnMappings were never being set, so when another
Update function (which this eventually called) went to map the parameters,
it couldn't find any matching column names, so it set all the parameter values
to null.

This code, or very similar code, appeared in:
 public int Update (DataRow [] dataRows)
 public int Update (DataTable dataTable)

But was left out of:
 public int Update (DataSet dataSet, string srcTable)

This code adds the relevant code into the function it was left out of.

Ideally, longer term, this code would be consolidated into a function which
was commonly called by all 3 update functions, but i didn't want to risk
breaking the other two functions which probably already work fine.
changed core funcs to apply easy calling or referencing
增加ueditor的demo

Signed-off-by: rodneytt at work <rodneytt@sina.com>
Added an option to choose a different symbol globally.

Signed-off-by: Rok Strniša <rok.strnisa@citrix.com>
調整經緯度解析度到 0.001
new version 增加鄉村
拿掉自動 load 鄉鎮的功能
拿掉放大的判斷code
data_csv 可以允許不給
Merge branch 'fusiontable_2'
Wind testing
improved Config class for UNIX systems
Update cmd/zvol_id/Makefile.in
Added links to blank pages for bottom nav
completion for @description and @details roxygen2 tags
move version control commands back onto tools menu
Grammar fix
Merge pull request #29 from ericmathison/typo-fix

Grammar fix
updating doc format -- again
fix f: didn't stop recursion into dot dirs
Minor tweak to allow font sizes to be easily changed by CSS
Remove the last.fm logo. Who works there anymore anyway...
beautify login
Method#eql? returns true for methods defined using the same block/proc.
Method#eql? returns true if a method was defined using the other one.
Rewrite Marshal.dump specs
Encoding support for Marshal.dump
Update Marshal.dump tags
Spec Marshal.load error handling
Stricter Marshal.load
Spec some obscure globals
Implement some obscure globals
fix Kernel#exec failing with a dash and no args

close #1555
Merge pull request #1606 from cldwalker/exec_with_dash

fix Kernel#exec failing with a dash and no args
Revert "fix Kernel#exec failing with a dash and no args"

This reverts commit 218604001db728bb9423c506151ec36d08b2d83b.
Whoops, separate spec + implementation
fix Kernel#exec failing with a dash and no args
spec for fixing Kernel#exec with dash
Merge pull request #1607 from cldwalker/exec_with_dash2

fix Kernel#exec with dash - take 2
Remove tags for passing specs
Spec #method's result when #respond_to_missing? returns true
Extract CompiledMethod#parameters
Kernel#method tries #respond_to_missing? in 1.9
Dequarantine and fix Kernel#freeze specs
Document abstract-target and its subclasses.

git-svn-id: http://svn.boost.org/svn/boost/trunk@77757 b8fc166d-592f-0410-95f2-cb63ce0dd405
rearranging files

git-svn-id: http://svn.boost.org/svn/boost/trunk@78106 b8fc166d-592f-0410-95f2-cb63ce0dd405
turn off debug symbols on msvc

git-svn-id: http://svn.boost.org/svn/boost/trunk@80211 b8fc166d-592f-0410-95f2-cb63ce0dd405
context: support for qcc on QNX neutrino


git-svn-id: http://svn.boost.org/svn/boost/trunk@80212 b8fc166d-592f-0410-95f2-cb63ce0dd405
context: tab cleanup


git-svn-id: http://svn.boost.org/svn/boost/trunk@78544 b8fc166d-592f-0410-95f2-cb63ce0dd405
Make BOOST_x_DYN_LINK tbe default

git-svn-id: http://svn.boost.org/svn/boost/trunk@77999 b8fc166d-592f-0410-95f2-cb63ce0dd405
Fix #6690 and #6737, resolving static linking related problems with VC++ 8 through 11. Note that this fix may reintroduce codecvt thread safety problems #4889, #6320, for these compilers if static linking is used.

git-svn-id: http://svn.boost.org/svn/boost/trunk@78000 b8fc166d-592f-0410-95f2-cb63ce0dd405
Prevent Growl crash at shutdown, due to accented characters in message.
RLS: updated documentation
targetディレクトリを無視するように設定
file times
stable
port sigil: upgrade to 0.5.3, maintainer timeout, close ticket #34241


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92921 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/cloog: fixed universal building (#34395)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92922 d073be05-634f-4543-b044-5fe20cf6d1d6
devel/cloog: fixed universal building (#34395) - fixed a bad commit


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@92923 d073be05-634f-4543-b044-5fe20cf6d1d6
nmap: update license now that OpenSSLException is an available choice


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93409 d073be05-634f-4543-b044-5fe20cf6d1d6
gss: version 1.0.2


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@93410 d073be05-634f-4543-b044-5fe20cf6d1d6
gst-plugins-*: Use muniversal to work around buggy architecture detection


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91948 d073be05-634f-4543-b044-5fe20cf6d1d6
xorg-server: Bump to 1.12.1


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91949 d073be05-634f-4543-b044-5fe20cf6d1d6
gstreamer: Use muniversal to work around buggy architecture detection


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@91950 d073be05-634f-4543-b044-5fe20cf6d1d6
postfix: add postgresql92 variant (#36242)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97972 d073be05-634f-4543-b044-5fe20cf6d1d6
cabocha: fix license; install additional documents and extra tools.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97973 d073be05-634f-4543-b044-5fe20cf6d1d6
New port: KNBC @1.0_090925 - Kyoto-University and NTT Blog Corpus.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97974 d073be05-634f-4543-b044-5fe20cf6d1d6
New port: jdepp @2012-09-11 - C++ implementation of Japanese Dependency Parsers.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@97975 d073be05-634f-4543-b044-5fe20cf6d1d6
OCaml 4.00.1


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98621 d073be05-634f-4543-b044-5fe20cf6d1d6
boost: only make +python27 a default variant if no other python variant has been selected (#37075) nor the debug variant (#37111)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100008 d073be05-634f-4543-b044-5fe20cf6d1d6
zeroc-ice34: reverse merge r100468 which broke build.


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100476 d073be05-634f-4543-b044-5fe20cf6d1d6
fizmo: fix build for non-default MacPorts prefix (#37246)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100477 d073be05-634f-4543-b044-5fe20cf6d1d6
postfix: update to 2.9.5


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100478 d073be05-634f-4543-b044-5fe20cf6d1d6
bison: version 2.7


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@100479 d073be05-634f-4543-b044-5fe20cf6d1d6
trac: add livecheck (fixes #36534 - thanks pixilla!)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98588 d073be05-634f-4543-b044-5fe20cf6d1d6
flex: add m4 dependency (#36450)


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98589 d073be05-634f-4543-b044-5fe20cf6d1d6
mpich2: use conflicts_build portgroup


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98590 d073be05-634f-4543-b044-5fe20cf6d1d6
lammpi: fix livecheck


git-svn-id: http://svn.macports.org/repository/macports/trunk/dports@98591 d073be05-634f-4543-b044-5fe20cf6d1d6
Fixed compiler reenterability
Fixed compiler reenterability
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed compiler reenterability
  Fixed compiler reenterability

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compiler reenterability
  Fixed compiler reenterability
Fixed bug #62744 (dangling pointers made by zend_disable_class)

the test will be added while commit the fix for #62737
This becomes useless, since we have set that in the INIT macro
Merge branch 'PHP-5.3' into PHP-5.4

Conflicts:
	Zend/zend_API.h
Merge branch 'PHP-5.3' into PHP-5.4
Merge branch 'PHP-5.4'
rename package to socks rather than socks5
Add GTK 3 to list of supported GTK versions
Blacklist 淋しい, it's an unresolvable dupe of 寂しい
Better blacklist for 淋しい
Polished making a poll without javascript
Replace GitSharp in GitCommit and GitTreeEntry

The paths returned from LibGit2Sharp are platform
dependent, while the paths returned from TFS are
URIs that use a forward slash.
fixed a bug in LowPriorityDenseMatrix1.canCollapseCols

The bug caused it to apply the function only the first from.cols rows
merged with upstream
fix test compile failure
separate Counter.count(a, b, c) from Counter.countTraversable(Iterator(...))
Fixes #23. MapValues for CSCMatrix.
Added a few utility methods (toDenseVector/toDenseMatrix, slicing,
findAll).
fixed decode problem in CRFTEst
added another way of transposing that requires less gymnastics
added an argtopk method...
Merge branch 'master' of github.com:dlwh/breeze

Conflicts:
	math/src/main/scala/breeze/linalg/Tensor.scala
fixes to some tests.
inPlace operations for UFuncs
LDA clustering algorithm
made a bunch of functions UFuncs and URFuncs
remove some warnings
fix for email addresses at end of sentence.
ones method
all/any methods on quasitensors
added an axpy operation, that is basically a
fused multiply-add: y += a * x.
Merge branch 'master' of https://github.com/dlwh/breeze
fix: vfs.c/dpl_mknod(): wrong path creation

We used to add a delimiter even if it already existed, thus
having "some/weird//path"
Rust 0.3

Closes #13389.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
pcre 8.31

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
shiboken: fixed missing dependency on qt

Closes #13377.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Remove Formula: apiextractor, generatorrunner

These projects were subsumed into Shiboken v1.1.1:

  http://www.pyside.org/2012/04/pyside-1-1-1-free-hugs-python-for-qt-released
poppler 0.20.2

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
New formula: Cogl

Cogl is a dependency of clutter 1.10.x

Closes #12723.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
clutter 1.10.6

Closes #12724.
clutter: update configure options

Building the X11 backend fails with XQuartz (at least); patches welcome
to remedy this.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into powerpc
More pom work (reporting mostly). ver=1.0.1-SNAPSHOT
Javadoc fixes...

Sometimes I wonder how I manage to write some of these.
Getpass should let parent declare url...
Tell pmd not to do xref as we aren't building sources.

Not that it works. I still get warnings for the site build.
Made modification to pg gem.
Fix logic bug for posting JSON objects.
Add params; generalize opts; fix UTF-8 encoding.
Add PUT and DELETE methods.
add install procedure
update source
BUILD: Fix missing directory creation in aos4dist target.
VIDEO: Fix compilation with some compilers
sreentest
Updated screenrc.
New git repo. Old fork but lots of changes.
Try again.
removed some data.
Testing out pear Auth for Fannie. Poked around some reports.
Deleted lab files.
Revert "removed some data."

This reverts commit 3c9c3771b0e84a288947eff576079c07758b264e.
Revert "Deleted lab files."

This reverts commit 20b7481891c2ef17db0de7c0974c3b989141a7a6.
Debugged timesheet to see rounding.
Still moving things around. Focusing on item maint and logging/auth.
Added mysqli_real_escape_string to item Maint. Added functions to Common.php. Minor mods to styles and subdept mgmt.
Reset.css added for courier instruction.
Merge pull request #19 from sectoidman/alpha

Updated gitignore to exclude CMake-generated files and player config fil...
Merge pull request #20 from sectoidman/alpha

Changed aux.* to auxil.* to allow building on windows, as aux.* appears ...
Initial test of character building system and syntax
Constructor now works. Eventually neutral states will be added to the constructor, probably hard-coded, since I don't intend for those to be customizable per se, beyond rectangles.
Minor fix
Let's see if I broke trie
Merge branch 'beta', remote-tracking branch 'origin' into alpha
Minor tweaks now that I'm running at correct framerate again
Added mandatory states to character builder. Currently this means that character building breaks without these states.
Added some duplicates for now
Included assert to ensure that stuff doesn't hang when it breaks
Made sprites for this thing work again
Adjusted some hitboxes
Hitbox changes
continued minor tweaks to hitboxes
c/cpp include headers:AutoComplPop disabled
Solved layoud-land error
Reading Contacts Completed
new setup finished
User locking/unlocking

- Attribute active indicates if user has already signed up
- Attribute locked indicates if user account was locked by admin
added SPCEhw.c to simulate hard wall potentials
Fixing two warnings.
now supports xml in addition to json
removed third column separator in triple verbose output
cleaning up DSL
settings formatted
wip publish message
removed queues
started channel delegate
Accept Rabbit::Fomrat::Size as indent value
clear-blue: indent the first paragraph in block quote
added flag & rating

maybe I will create a profile for login users( so we can display rating)
Shower submodule
ログイン後トップアクセスリダイレクト処理追加
loop_items/showビュー追加
コンフリクト解消

Merge branch 'design_new' of github.com:shu0115/loooper into design_new

Conflicts:
	app/views/loop_items/_do_now.html.haml
Add time header to fix travis-ci.org
- Use TwistedStatsDClient instead of custom implementation, since it supports resolving hostname and this really is a statsd client here.
BuyVM Stock Checker
Add status and misc style tweaks
Fixed bug where Pager page was not getting reset on search.
ProgrammingIsHappy
vim: Remove vimwiki.
vim: Update plugins.
remise en forme de v_informations (structure)
버젼 표기 변경
Update gsd spacing